Use std::unique_ptr instead of QScopedPointer with deprecated take()

Change-Id: I5160ac9a64e58a54b012f2d45d0f9a88f9569d6d
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/httpserver/qhttpserverresponder.cpp b/src/httpserver/qhttpserverresponder.cpp
index 2cfc974..9eceb00 100644
--- a/src/httpserver/qhttpserverresponder.cpp
+++ b/src/httpserver/qhttpserverresponder.cpp
@@ -152,8 +152,8 @@ QHttpServerResponder::QHttpServerResponder(const QHttpServerRequest &request,
     Move-constructs a QHttpServerResponder instance, making it point
     at the same object that \a other was pointing to.
 */
-QHttpServerResponder::QHttpServerResponder(QHttpServerResponder &&other) :
-    d_ptr(other.d_ptr.take())
+QHttpServerResponder::QHttpServerResponder(QHttpServerResponder &&other)
+    : d_ptr(std::move(other.d_ptr))
 {}
 
 /*!
@@ -178,7 +178,7 @@ void QHttpServerResponder::write(QIODevice *data,
 {
     Q_D(QHttpServerResponder);
     Q_ASSERT(d->socket);
-    QScopedPointer<QIODevice, QScopedPointerDeleteLater> input(data);
+    std::unique_ptr<QIODevice, QScopedPointerDeleteLater> input(data);
 
     input->setParent(nullptr);
     if (!input->isOpen()) {
@@ -218,7 +218,7 @@ void QHttpServerResponder::write(QIODevice *data,
     }
 
     // input takes ownership of the IOChunkedTransfer pointer inside his constructor
-    new IOChunkedTransfer<>(input.take(), d->socket);
+    new IOChunkedTransfer<>(input.release(), d->socket);
 }
 
 /*!
diff --git a/src/httpserver/qhttpserverresponder.h b/src/httpserver/qhttpserverresponder.h
index f19f263..f3e17d1 100644
--- a/src/httpserver/qhttpserverresponder.h
+++ b/src/httpserver/qhttpserverresponder.h
@@ -36,10 +36,10 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qmimetype.h>
 
+#include <memory>
 #include <utility>
 #include <initializer_list>
 
@@ -177,7 +177,7 @@ public:
 private:
     QHttpServerResponder(const QHttpServerRequest &request, QTcpSocket *socket);
 
-    QScopedPointer<QHttpServerResponderPrivate> d_ptr;
+    std::unique_ptr<QHttpServerResponderPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/httpserver/qhttpserverresponse.cpp b/src/httpserver/qhttpserverresponse.cpp
index 47c3b49..0d4ba4b 100644
--- a/src/httpserver/qhttpserverresponse.cpp
+++ b/src/httpserver/qhttpserverresponse.cpp
@@ -52,7 +52,7 @@ QHttpServerResponsePrivate::QHttpServerResponsePrivate(const QHttpServerResponse
 { }
 
 QHttpServerResponse::QHttpServerResponse(QHttpServerResponse &&other) noexcept
-    : d_ptr(other.d_ptr.take())
+    : d_ptr(std::move(other.d_ptr))
 {
 }
 
diff --git a/src/httpserver/qhttpserverresponse.h b/src/httpserver/qhttpserverresponse.h
index b56fddb..975ab32 100644
--- a/src/httpserver/qhttpserverresponse.h
+++ b/src/httpserver/qhttpserverresponse.h
@@ -32,7 +32,7 @@
 
 #include <QtHttpServer/qhttpserverresponder.h>
 
-#include <QtCore/qscopedpointer.h>
+#include <memory>
 
 QT_BEGIN_NAMESPACE
 
@@ -117,7 +117,7 @@ public:
 protected:
     QHttpServerResponse(QHttpServerResponsePrivate *d);
 
-    QScopedPointer<QHttpServerResponsePrivate> d_ptr;
+    std::unique_ptr<QHttpServerResponsePrivate> d_ptr;
 };
 
 QT_END_NAMESPACE