Merge "Port from QScopedPointer to std::unique_ptr"

src/network/kernel/qnetworkinterface.cpp

@@ -49,6 +49,9 @@
 
 QT_BEGIN_NAMESPACE
 
+static_assert(QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+           && sizeof(QScopedPointer<QNetworkAddressEntryPrivate>) == sizeof(std::unique_ptr<QNetworkAddressEntryPrivate>));
+
 static QList<QNetworkInterfacePrivate *> postProcess(QList<QNetworkInterfacePrivate *> list)
 {
     // Some platforms report a netmask but don't report a broadcast address
@@ -204,7 +207,7 @@ QNetworkAddressEntry::QNetworkAddressEntry()
     object \a other.
 */
 QNetworkAddressEntry::QNetworkAddressEntry(const QNetworkAddressEntry &other)
-    : d(new QNetworkAddressEntryPrivate(*other.d.data()))
+    : d(new QNetworkAddressEntryPrivate(*other.d.get()))
 {
 }
 
@@ -213,7 +216,7 @@ QNetworkAddressEntry::QNetworkAddressEntry(const QNetworkAddressEntry &other)
 */
 QNetworkAddressEntry &QNetworkAddressEntry::operator=(const QNetworkAddressEntry &other)
 {
-    *d.data() = *other.d.data();
+    *d.get() = *other.d.get();
     return *this;
 }
 

src/network/kernel/qnetworkinterface.h

@@ -45,6 +45,8 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qhostaddress.h>
 
+#include <memory>
+
 #ifndef QT_NO_NETWORKINTERFACE
 
 QT_BEGIN_NAMESPACE
@@ -96,7 +98,8 @@ public:
     bool isTemporary() const { return !isPermanent(); }
 
 private:
-    QScopedPointer<QNetworkAddressEntryPrivate> d;
+    // ### Qt 7: make implicitly shared
+    std::unique_ptr<QNetworkAddressEntryPrivate> d;
 };
 
 Q_DECLARE_SHARED(QNetworkAddressEntry)

src/network/ssl/qsslcipher.cpp

@@ -68,6 +68,9 @@
 
 QT_BEGIN_NAMESPACE
 
+static_assert(QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+           && sizeof(QScopedPointer<QSslCipherPrivate>) == sizeof(std::unique_ptr<QSslCipherPrivate>));
+
 /*!
     Constructs an empty QSslCipher object.
 */
@@ -127,7 +130,7 @@ QSslCipher::QSslCipher(const QString &name, QSsl::SslProtocol protocol)
 QSslCipher::QSslCipher(const QSslCipher &other)
     : d(new QSslCipherPrivate)
 {
-    *d.data() = *other.d.data();
+    *d.get() = *other.d.get();
 }
 
 /*!
@@ -143,7 +146,7 @@ QSslCipher::~QSslCipher()
 */
 QSslCipher &QSslCipher::operator=(const QSslCipher &other)
 {
-    *d.data() = *other.d.data();
+    *d.get() = *other.d.get();
     return *this;
 }
 

src/network/ssl/qsslcipher.h

@@ -46,6 +46,8 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qssl.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 
@@ -81,7 +83,8 @@ public:
     QSsl::SslProtocol protocol() const;
 
 private:
-    QScopedPointer<QSslCipherPrivate> d;
+    // ### Qt 7: make implicitly shared
+    std::unique_ptr<QSslCipherPrivate> d;
     friend class QSslSocketBackendPrivate;
 };