Rest of QtBase: 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 and owning containers

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: I53e031a021031d53a74a712cd0f5e6bb8bf800bd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 2 insertions, 4 deletions

diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index a956a54f7b..8c1be600aa 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -70,7 +70,7 @@ public:
     bool operator!=(const QSqlError& other) const;
     ~QSqlError();
 
-    void swap(QSqlError &other) noexcept { qSwap(d, other.d); }
+    void swap(QSqlError &other) noexcept { qt_ptr_swap(d, other.d); }
 
     QString driverText() const;
     QString databaseText() const;
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index b34452c302..132bc41396 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -80,9 +80,7 @@ public:
     ~QSqlQuery();
 
     void swap(QSqlQuery &other) noexcept
-    {
-        qSwap(d, other.d);
-    }
+    { qt_ptr_swap(d, other.d); }
 
     bool isValid() const;
     bool isActive() const;