diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-10-02 17:49:19 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-10-04 07:43:59 +0200 |
| commit | 1ba4f7369231868b2bbf4b2dd852abcdda69a953 (patch) | |
| tree | 5830bdd3083be6c533537503ee09cea2b91ca1d3 /src/corelib/kernel/qpointer.h | |
| parent | aeeb77650f05f90bb87ffe7e66cc2b6b3713ad2f (diff) | |
QPointer: make swap(lhs, rhs) a hidden friend
This is how we like our free functions these days.
Task-number: QTBUG-87973
Change-Id: I55b5f2674d24c7b76b8dc425a4f1c5520b8c1ec4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qpointer.h')
| -rw-r--r-- | src/corelib/kernel/qpointer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 7de159a535..7138258050 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -77,6 +77,9 @@ public: inline void clear() { wp.clear(); } + friend void swap(QPointer &lhs, QPointer &rhs) noexcept + { lhs.swap(rhs); } + #define DECLARE_COMPARE_SET(T1, A1, T2, A2) \ friend bool operator==(T1, T2) \ { return A1 == A2; } \ @@ -109,10 +112,6 @@ qPointerFromVariant(const QVariant &variant) return QPointer<T>{qobject_cast<T*>(QtPrivate::EnableInternalData::internalData(wp))}; } -template <class T> -inline void swap(QPointer<T> &p1, QPointer<T> &p2) noexcept -{ p1.swap(p2); } - QT_END_NAMESPACE #endif // QT_NO_QOBJECT |