qcore_mac_p.h: 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.4 6.3 6.2
Task-number: QTBUG-97601
Change-Id: Iad8e6c11ebcc3ff822479c36f5faff88992b1165
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 9e272e834c..ff909a3ff2 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -284,8 +284,8 @@ public:
 
     void swap(QAppleLogActivity &other)
     {
-        qSwap(activity, other.activity);
-        qSwap(state, other.state);
+        activity.swap(other.activity);
+        std::swap(state, other.state);
     }
 
 private:
@@ -342,7 +342,7 @@ public:
 
     void swap(QMacNotificationObserver &other) noexcept
     {
-        qSwap(observer, other.observer);
+        qt_ptr_swap(observer, other.observer);
     }
 
     void remove();
@@ -392,9 +392,9 @@ public:
 
     void swap(QMacKeyValueObserver &other) noexcept
     {
-        qSwap(object, other.object);
-        qSwap(keyPath, other.keyPath);
-        qSwap(callback, other.callback);
+        qt_ptr_swap(object, other.object);
+        qt_ptr_swap(keyPath, other.keyPath);
+        callback.swap(other.callback);
     }
 
 private: