From 38d6f09d30acd82de5654b6b5ca8bdc0f200b53d Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 26 Apr 2022 09:44:25 -0700
Subject: [PATCH] Replace QScopedPointer with std::unique_ptr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/wayland/qwaylanddisplay.cpp             | 2 +-
 src/plugins/platforms/wayland/qwaylanddisplay_p.h             | 4 ++--
 .../shellintegration/qwaylandshellintegrationfactory.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 2c275a92e22..80af2ca4995 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -389,7 +389,7 @@ QWaylandDisplay::~QWaylandDisplay(void)
     qDeleteAll(mWaitingScreens);
 
 #if QT_CONFIG(wayland_datadevice)
-    delete mDndSelectionHandler.take();
+    mDndSelectionHandler.reset();
 #endif
 #if QT_CONFIG(cursor)
     mCursorThemes.clear();
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
index daef31e522c..c81b09ce0a1 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
@@ -165,7 +165,7 @@ public:
     QWaylandInputDevice *defaultInputDevice() const;
     QWaylandInputDevice *currentInputDevice() const { return defaultInputDevice(); }
 #if QT_CONFIG(wayland_datadevice)
-    QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.data(); }
+    QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.get(); }
 #endif
 #if QT_CONFIG(wayland_client_primary_selection)
     QWaylandPrimarySelectionDeviceManagerV1 *primarySelectionManager() const { return mPrimarySelectionManager.data(); }
@@ -249,7 +249,7 @@ private:
     };
 
     struct wl_display *mDisplay = nullptr;
-    QScopedPointer<EventThread> m_eventThread;
+    std::unique_ptr<EventThread> m_eventThread;
     wl_event_queue *m_frameEventQueue = nullptr;
     QScopedPointer<EventThread> m_frameEventQueueThread;
     QtWayland::wl_compositor mCompositor;
diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp
index e3a9aeb377b..ade2b4e3c1f 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp
@@ -58,13 +58,13 @@ QStringList QWaylandShellIntegrationFactory::keys()
 
 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));
 
     if (integration && !integration->initialize(display))
         return nullptr;
 
-    return integration.take();
+    return integration.release();
 }
 
 }