From 28ce318fcbccb5a117ca4e55322ee1c1dd8d05d4 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 17 May 2019 20:04:40 +0200 Subject: Cleanup the fallout of QWeakPointer::data() deprecation There are still users of QWeakPointer::data(), which under certain compilers will make headersclean fail. So this patch: * ports data() to a private internalData() function and calls it from all the usage points; * adds cleanup notes for Qt 6, once some of the deprecated machinery around storing unmanaged QObjects in QWeakPointers can get removed. Change-Id: Id3bcbd23374c18a2026861c08a4dcba1670673c1 Reviewed-by: Marc Mutz Reviewed-by: Mike Krus --- src/corelib/kernel/qpointer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/kernel/qpointer.h') diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 3e92289792..80faef2990 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -83,7 +83,7 @@ public: { wp.assign(static_cast(p)); return *this; } inline T* data() const - { return static_cast(wp.d == nullptr || wp.d->strongref.load() == 0 ? nullptr : wp.value); } + { return static_cast(wp.internalData()); } inline T* operator->() const { return data(); } inline T& operator*() const @@ -143,7 +143,7 @@ template QPointer qPointerFromVariant(const QVariant &variant) { - return QPointer(qobject_cast(QtSharedPointer::weakPointerFromVariant_internal(variant).data())); + return QPointer(qobject_cast(QtSharedPointer::weakPointerFromVariant_internal(variant).internalData())); } template -- cgit v1.2.3