diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 17:14:30 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 10:32:39 +0200 |
| commit | e40320c552a9ccd4c1879a4da13c8d909b2cd21e (patch) | |
| tree | 561808de17df759733d62a3a371fcf5a1202e39e /src/corelib/tools | |
| parent | 860c68522bbccfd2fe50a1ba453096bc6c14252e (diff) | |
QWeakPointer: purge deprecated API
Since 5.0: assignment/construction from QObject pointer
Since 5.14: data() to recover the packaged pointer
Change-Id: I5d6ab561ce39bc0d9d3e5035eb2ca38139cd76b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 35058a1c6e..30bccb66a4 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -63,9 +63,6 @@ QT_END_NAMESPACE #include <new> #include <QtCore/qatomic.h> #include <QtCore/qobject.h> // for qobject_cast -#if QT_DEPRECATED_SINCE(5, 6) -#include <QtCore/qhash.h> -#endif #include <QtCore/qhashfunctions.h> #include <memory> @@ -555,29 +552,9 @@ public: explicit operator bool() const noexcept { return !isNull(); } bool operator !() const noexcept { return isNull(); } -#if QT_DEPRECATED_SINCE(5, 14) - QT_DEPRECATED_X("Use toStrongRef() instead, and data() on the returned QSharedPointer") - T *data() const noexcept { return internalData(); } -#endif - inline QWeakPointer() noexcept : d(nullptr), value(nullptr) { } inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; } -#ifndef QT_NO_QOBJECT - // special constructor that is enabled only if X derives from QObject -#if QT_DEPRECATED_SINCE(5, 0) - template <class X, IfCompatible<X> = true> - QT_DEPRECATED inline QWeakPointer(X *ptr) : d(ptr ? Data::getAndRef(ptr) : nullptr), value(ptr) - { } -#endif -#endif - -#if QT_DEPRECATED_SINCE(5, 0) - template <class X, IfCompatible<X> = true> - QT_DEPRECATED inline QWeakPointer &operator=(X *ptr) - { return *this = QWeakPointer(ptr); } -#endif - QWeakPointer(const QWeakPointer &other) noexcept : d(other.d), value(other.value) { if (d) d->weakref.ref(); } QWeakPointer(QWeakPointer &&other) noexcept |