From 1ba4f7369231868b2bbf4b2dd852abcdda69a953 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Mon, 2 Oct 2023 17:49:19 +0200
Subject: [PATCH] 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>
---
 src/corelib/kernel/qpointer.h | 7 +++----
 1 file 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