1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QScopedPointer with std::unique_ptr

Browse Source 
As the warning asked.

qwaylandshellintegrationfactory.cpp:67:28: warning: ‘T* QScopedPointer<T, Cleanup>::take() [with T = QtWaylandClient::QWaylandShellIntegration; Cleanup = QScopedPointerDeleter<QtWaylandClient::QWaylandShellIntegration>]’ is deprecated: Use std::unique_ptr instead, and call release(). [-Wdeprecated-declarations]

As a drive-by, change *foo.get() to *foo.

Pick-to: 6.3 6.2
Change-Id: I7fb65b80b7844c8d8f26fffd16e97fe161d6a67a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-04-26 09:44:25 -07:00 committed by Marc Mutz
parent aedb14b232
commit 38d6f09d30
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -389,7 +389,7 @@ QWaylandDisplay::~QWaylandDisplay(void)
qDeleteAll(mWaitingScreens); qDeleteAll(mWaitingScreens);
#if QT_CONFIG(wayland_datadevice) #if QT_CONFIG(wayland_datadevice)
delete mDndSelectionHandler.take(); mDndSelectionHandler.reset();
#endif #endif
#if QT_CONFIG(cursor) #if QT_CONFIG(cursor)
mCursorThemes.clear(); mCursorThemes.clear();

4
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -165,7 +165,7 @@ public:
QWaylandInputDevice *defaultInputDevice() const; QWaylandInputDevice *defaultInputDevice() const;
QWaylandInputDevice *currentInputDevice() const { return defaultInputDevice(); } QWaylandInputDevice *currentInputDevice() const { return defaultInputDevice(); }
#if QT_CONFIG(wayland_datadevice) #if QT_CONFIG(wayland_datadevice)
QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.data(); } QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.get(); }
#endif #endif
#if QT_CONFIG(wayland_client_primary_selection) #if QT_CONFIG(wayland_client_primary_selection)
QWaylandPrimarySelectionDeviceManagerV1 *primarySelectionManager() const { return mPrimarySelectionManager.data(); } QWaylandPrimarySelectionDeviceManagerV1 *primarySelectionManager() const { return mPrimarySelectionManager.data(); }
@ -249,7 +249,7 @@ private:
}; };
struct wl_display *mDisplay = nullptr; struct wl_display *mDisplay = nullptr;
QScopedPointer<EventThread> m_eventThread; std::unique_ptr<EventThread> m_eventThread;
wl_event_queue *m_frameEventQueue = nullptr; wl_event_queue *m_frameEventQueue = nullptr;
QScopedPointer<EventThread> m_frameEventQueueThread; QScopedPointer<EventThread> m_frameEventQueueThread;
QtWayland::wl_compositor mCompositor; QtWayland::wl_compositor mCompositor;

4
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp
View File

@ -58,13 +58,13 @@ QStringList QWaylandShellIntegrationFactory::keys()
QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString &name, QWaylandDisplay *display, const QStringList &args) QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString &name, QWaylandDisplay *display, const QStringList &args)
{ {
QScopedPointer<QWaylandShellIntegration> integration; std::unique_ptr<QWaylandShellIntegration> integration;
integration.reset(qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args)); integration.reset(qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args));
if (integration && !integration->initialize(display)) if (integration && !integration->initialize(display))
return nullptr; return nullptr;
return integration.take(); return integration.release();
} }
} }