5 files changed, 11 insertions, 11 deletions
diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h
index 89d617a92e..350e6ff67f 100644
--- a/src/network/kernel/qdnslookup.h
+++ b/src/network/kernel/qdnslookup.h
@@ -69,7 +69,7 @@ public:
     QDnsDomainNameRecord &operator=(const QDnsDomainNameRecord &other);
     ~QDnsDomainNameRecord();
 
-    void swap(QDnsDomainNameRecord &other) noexcept { qSwap(d, other.d); }
+    void swap(QDnsDomainNameRecord &other) noexcept { d.swap(other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
@@ -91,7 +91,7 @@ public:
     QDnsHostAddressRecord &operator=(const QDnsHostAddressRecord &other);
     ~QDnsHostAddressRecord();
 
-    void swap(QDnsHostAddressRecord &other) noexcept { qSwap(d, other.d); }
+    void swap(QDnsHostAddressRecord &other) noexcept { d.swap(other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
@@ -113,7 +113,7 @@ public:
     QDnsMailExchangeRecord &operator=(const QDnsMailExchangeRecord &other);
     ~QDnsMailExchangeRecord();
 
-    void swap(QDnsMailExchangeRecord &other) noexcept { qSwap(d, other.d); }
+    void swap(QDnsMailExchangeRecord &other) noexcept { d.swap(other.d); }
 
     QString exchange() const;
     QString name() const;
@@ -136,7 +136,7 @@ public:
     QDnsServiceRecord &operator=(const QDnsServiceRecord &other);
     ~QDnsServiceRecord();
 
-    void swap(QDnsServiceRecord &other) noexcept { qSwap(d, other.d); }
+    void swap(QDnsServiceRecord &other) noexcept { d.swap(other.d); }
 
     QString name() const;
     quint16 port() const;
@@ -161,7 +161,7 @@ public:
     QDnsTextRecord &operator=(const QDnsTextRecord &other);
     ~QDnsTextRecord();
 
-    void swap(QDnsTextRecord &other) noexcept { qSwap(d, other.d); }
+    void swap(QDnsTextRecord &other) noexcept { d.swap(other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index fd1567eb07..ecab6360e8 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -67,7 +67,7 @@ public:
     QHostInfo &operator=(QHostInfo &&other) noexcept { swap(other); return *this; }
     ~QHostInfo();
 
-    void swap(QHostInfo &other) noexcept { qSwap(d_ptr, other.d_ptr); }
+    void swap(QHostInfo &other) noexcept { qt_ptr_swap(d_ptr, other.d_ptr); }
 
     QString hostName() const;
     void setHostName(const QString &name);
diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h
index 70958fea42..2b4facecff 100644
--- a/src/network/kernel/qnetworkdatagram.h
+++ b/src/network/kernel/qnetworkdatagram.h
@@ -68,7 +68,7 @@ public:
     { swap(other); return *this; }
 
     void swap(QNetworkDatagram &other) noexcept
-    { qSwap(d, other.d); }
+    { qt_ptr_swap(d, other.d); }
 
     void clear();
     bool isValid() const;
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index ef4dce1c01..34e2929092 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -69,7 +69,7 @@ public:
     QNetworkAddressEntry &operator=(const QNetworkAddressEntry &other);
     ~QNetworkAddressEntry();
 
-    void swap(QNetworkAddressEntry &other) noexcept { qSwap(d, other.d); }
+    void swap(QNetworkAddressEntry &other) noexcept { d.swap(other.d); }
 
     bool operator==(const QNetworkAddressEntry &other) const;
     inline bool operator!=(const QNetworkAddressEntry &other) const
@@ -146,7 +146,7 @@ public:
     QNetworkInterface &operator=(const QNetworkInterface &other);
     ~QNetworkInterface();
 
-    void swap(QNetworkInterface &other) noexcept { qSwap(d, other.d); }
+    void swap(QNetworkInterface &other) noexcept { d.swap(other.d); }
 
     bool isValid() const;
 
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 1f0409e8ab..bf5af82064 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -79,7 +79,7 @@ public:
     QNetworkProxyQuery &operator=(const QNetworkProxyQuery &other);
     ~QNetworkProxyQuery();
 
-    void swap(QNetworkProxyQuery &other) noexcept { qSwap(d, other.d); }
+    void swap(QNetworkProxyQuery &other) noexcept { d.swap(other.d); }
 
     bool operator==(const QNetworkProxyQuery &other) const;
     inline bool operator!=(const QNetworkProxyQuery &other) const
@@ -142,7 +142,7 @@ public:
     QNetworkProxy &operator=(const QNetworkProxy &other);
     ~QNetworkProxy();
 
-    void swap(QNetworkProxy &other) noexcept { qSwap(d, other.d); }
+    void swap(QNetworkProxy &other) noexcept { d.swap(other.d); }
 
     bool operator==(const QNetworkProxy &other) const;
     inline bool operator!=(const QNetworkProxy &other) const