QtNetwork: compile-optimize inline swap functions

Instead of using the overly-generic qSwap() monster, use

- qt_ptr_swap() for swapping raw pointers
- member-swap for swapping smart pointers
- std::swap() for swapping scalars

In QtCore, this has proven to give a nice reduction in compile time
for Qt users, cf. b1b0c2970e480ef460a61f37fa430dc443390358.

Pick-to: 6.3 6.2
Task-number: QTBUG-97601
Change-Id: I26586da1f158fe6b18314abd8cf9bb040bc9cad1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

8 files changed, 8 insertions, 8 deletions

diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index e8349d502b..94e784745b 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -97,7 +97,7 @@ public:
     QSslCertificate &operator=(const QSslCertificate &other);
 
     void swap(QSslCertificate &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     bool operator==(const QSslCertificate &other) const;
     inline bool operator!=(const QSslCertificate &other) const { return !operator==(other); }
diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h
index 7cc8a888be..70a1108f95 100644
--- a/src/network/ssl/qsslcertificateextension.h
+++ b/src/network/ssl/qsslcertificateextension.h
@@ -59,7 +59,7 @@ public:
     QSslCertificateExtension &operator=(const QSslCertificateExtension &other);
     ~QSslCertificateExtension();
 
-    void swap(QSslCertificateExtension &other) noexcept { qSwap(d, other.d); }
+    void swap(QSslCertificateExtension &other) noexcept { d.swap(other.d); }
 
     QString oid() const;
     QString name() const;
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index bc54b1cf91..6d7aa592b5 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -66,7 +66,7 @@ public:
     ~QSslCipher();
 
     void swap(QSslCipher &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     bool operator==(const QSslCipher &other) const;
     inline bool operator!=(const QSslCipher &other) const { return !operator==(other); }
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 43566bc0cd..f88110f5a9 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -83,7 +83,7 @@ public:
     QSslConfiguration &operator=(const QSslConfiguration &other);
 
     void swap(QSslConfiguration &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     bool operator==(const QSslConfiguration &other) const;
     inline bool operator!=(const QSslConfiguration &other) const
diff --git a/src/network/ssl/qssldiffiehellmanparameters.h b/src/network/ssl/qssldiffiehellmanparameters.h
index c65697796b..9121c7bf64 100644
--- a/src/network/ssl/qssldiffiehellmanparameters.h
+++ b/src/network/ssl/qssldiffiehellmanparameters.h
@@ -82,7 +82,7 @@ public:
     QSslDiffieHellmanParameters &operator=(const QSslDiffieHellmanParameters &other);
     QSslDiffieHellmanParameters &operator=(QSslDiffieHellmanParameters &&other) noexcept { swap(other); return *this; }
 
-    void swap(QSslDiffieHellmanParameters &other) noexcept { qSwap(d, other.d); }
+    void swap(QSslDiffieHellmanParameters &other) noexcept { qt_ptr_swap(d, other.d); }
 
     static QSslDiffieHellmanParameters fromEncoded(const QByteArray &encoded, QSsl::EncodingFormat format = QSsl::Pem);
     static QSslDiffieHellmanParameters fromEncoded(QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem);
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index a5865a5a33..326e35301c 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -108,7 +108,7 @@ public:
     QSslError(const QSslError &other);
 
     void swap(QSslError &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     ~QSslError();
     QSslError &operator=(QSslError &&other) noexcept { swap(other); return *this; }
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index d9df2686e6..350829a572 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -74,7 +74,7 @@ public:
     QSslKey &operator=(const QSslKey &other);
     ~QSslKey();
 
-    void swap(QSslKey &other) noexcept { qSwap(d, other.d); }
+    void swap(QSslKey &other) noexcept { d.swap(other.d); }
 
     bool isNull() const;
     void clear();
diff --git a/src/network/ssl/qsslpresharedkeyauthenticator.h b/src/network/ssl/qsslpresharedkeyauthenticator.h
index 41112e3e43..56c0e25900 100644
--- a/src/network/ssl/qsslpresharedkeyauthenticator.h
+++ b/src/network/ssl/qsslpresharedkeyauthenticator.h
@@ -60,7 +60,7 @@ public:
 
     QSslPreSharedKeyAuthenticator &operator=(QSslPreSharedKeyAuthenticator &&other) noexcept { swap(other); return *this; }
 
-    void swap(QSslPreSharedKeyAuthenticator &other) noexcept { qSwap(d, other.d); }
+    void swap(QSslPreSharedKeyAuthenticator &other) noexcept { d.swap(other.d); }
 
     Q_NETWORK_EXPORT QByteArray identityHint() const;