QtNetwork: use Q_DISABLE_COPY_MOVE

We have several classes inheriting QObject (directly or not) and disabling
copy (thus non-movable implicitly). Let's make them non-movable explicitly
now.

Change-Id: I509a066e9977480b30842afef26319b8afec6001
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 1b7c578a9d..8df804144c 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -230,7 +230,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAbstractSocket)
-    Q_DISABLE_COPY(QAbstractSocket)
+    Q_DISABLE_COPY_MOVE(QAbstractSocket)
 
     Q_PRIVATE_SLOT(d_func(), void _q_connectToNextAddress())
     Q_PRIVATE_SLOT(d_func(), void _q_startConnecting(const QHostInfo &))
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index b2c8bcc884..e52eddfdbd 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -62,7 +62,7 @@ protected:
                QObject *parent = nullptr);
 
 private:
-    Q_DISABLE_COPY(QTcpSocket)
+    Q_DISABLE_COPY_MOVE(QTcpSocket)
     Q_DECLARE_PRIVATE(QTcpSocket)
 };
 
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h
index ce4429d1cd..e2ddba1362 100644
--- a/src/network/socket/qudpsocket.h
+++ b/src/network/socket/qudpsocket.h
@@ -83,7 +83,7 @@ public:
         { return writeDatagram(datagram.constData(), datagram.size(), host, port); }
 
 private:
-    Q_DISABLE_COPY(QUdpSocket)
+    Q_DISABLE_COPY_MOVE(QUdpSocket)
     Q_DECLARE_PRIVATE(QUdpSocket)
 };
 
diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h
index c3e7c6283a..aee8dc0f87 100644
--- a/src/network/ssl/qdtls.h
+++ b/src/network/ssl/qdtls.h
@@ -182,7 +182,7 @@ private:
     bool continueHandshake(QUdpSocket *socket, const QByteArray &dgram);
 
     Q_DECLARE_PRIVATE(QDtls)
-    Q_DISABLE_COPY(QDtls)
+    Q_DISABLE_COPY_MOVE(QDtls)
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/ssl/qdtls_openssl.cpp b/src/network/ssl/qdtls_openssl.cpp
index cbbce65999..c5891390a7 100644
--- a/src/network/ssl/qdtls_openssl.cpp
+++ b/src/network/ssl/qdtls_openssl.cpp
@@ -131,7 +131,7 @@ struct FallbackCookieSecret
 
     QByteArray key;
 
-    Q_DISABLE_COPY(FallbackCookieSecret)
+    Q_DISABLE_COPY_MOVE(FallbackCookieSecret)
 };
 
 QByteArray fallbackSecret()
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index c63a74a68c..a3fd14b813 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -191,7 +191,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QSslSocket)
-    Q_DISABLE_COPY(QSslSocket)
+    Q_DISABLE_COPY_MOVE(QSslSocket)
     Q_PRIVATE_SLOT(d_func(), void _q_connectedSlot())
     Q_PRIVATE_SLOT(d_func(), void _q_hostFoundSlot())
     Q_PRIVATE_SLOT(d_func(), void _q_disconnectedSlot())