diff options
| author | Oleksii Zbykovskyi <Oleksii.Zbykovskyi@qt.io> | 2025-07-28 14:37:49 +0200 |
|---|---|---|
| committer | Oleksii Zbykovskyi <Oleksii.Zbykovskyi@qt.io> | 2025-07-30 09:30:35 +0200 |
| commit | bd0fa8b0d39ab48a7845e7874763cc95359f92fd (patch) | |
| tree | 3e6c67ce218b3e816309c85cb2b5eefddac25839 /src/corelib/tools/qsharedpointer.cpp | |
| parent | d7097efcb8d01e1cc639727a67ee4fac916f8363 (diff) | |
Remove documentation of non-existing QWeakPointer members
For historical reasons, qdoc sees a different declaration of
QWeakPointer than the compiler, and when we removed deprecated members
from the latter in e40320c552a9ccd4c1879a4da13c8d909b2cd21e for Qt 6.0,
we evidently forgot the former.
Remove those now from the declaration that qdoc sees as well, so that
we don't claim that they exist as deprecated members.
Pick-to: 6.5 6.8 6.9 6.10
Change-Id: I1167a9317df727054c0b0bc447083d64b59087bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/tools/qsharedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index ded0921f685..1fb9ca784e2 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -845,37 +845,6 @@ */ /*! - \fn template <class T> QWeakPointer<T>::QWeakPointer(const QObject *other) - \since 4.6 - \deprecated - - Creates a QWeakPointer that holds a weak reference directly to the - QObject \a other. This constructor is only available if the template type - \tt T is QObject or derives from it (otherwise a compilation error will - result). - - You can use this constructor with any QObject, even if they were not - created with \l QSharedPointer. - - Note that QWeakPointers created this way on arbitrary QObjects usually - cannot be promoted to QSharedPointer. - - \sa QSharedPointer, QPointer -*/ - -/*! - \fn template <class T> QWeakPointer &QWeakPointer<T>::operator=(const QObject *other) - \since 4.6 - \deprecated - - Makes this QWeakPointer hold a weak reference directly to the QObject - \a other. This function is only available if the template type \tt T is - QObject or derives from it. - - \sa QPointer -*/ - -/*! \fn template <class T> QWeakPointer &QWeakPointer<T>::operator=(const QWeakPointer<T> &other) Makes this object share \a other's pointer. The current pointer @@ -947,29 +916,6 @@ */ /*! - \fn template <class T> T *QWeakPointer<T>::data() const - \since 4.6 - \deprecated Use toStrongRef() instead, and data() on the returned QSharedPointer. - - Returns the value of the pointer being tracked by this QWeakPointer, - \b without ensuring that it cannot get deleted. To have that guarantee, - use toStrongRef(), which returns a QSharedPointer object. If this - function can determine that the pointer has already been deleted, it - returns \nullptr. - - It is ok to obtain the value of the pointer and using that value itself. - - However, dereferencing the pointer is only allowed if you can guarantee - by external means that the pointer does not get deleted. For example, - if you can be certain that no other thread can delete it, nor the - functions that you may call. - - Use this function with care. - - \sa isNull(), toStrongRef() -*/ - -/*! \fn template <class T> QSharedPointer<T> QWeakPointer<T>::toStrongRef() const Promotes this weak reference to a strong one and returns a |