summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.cpp6
-rw-r--r--src/corelib/global/qlibraryinfo.cpp4
-rw-r--r--src/corelib/global/qnamespace.qdoc6
-rw-r--r--src/corelib/kernel/qmetatype.cpp12
-rw-r--r--src/corelib/kernel/qobject.cpp8
-rw-r--r--src/corelib/kernel/qsocketnotifier.cpp2
-rw-r--r--src/corelib/kernel/qvariant.cpp10
-rw-r--r--src/corelib/text/qlocale.cpp12
-rw-r--r--src/corelib/text/qstring.cpp4
-rw-r--r--src/corelib/text/qstringview.cpp6
-rw-r--r--src/corelib/text/qutf8stringview.qdoc6
-rw-r--r--src/corelib/thread/qfuture.qdoc8
-rw-r--r--src/corelib/thread/qfuturewatcher.cpp10
-rw-r--r--src/corelib/time/qtimezone.cpp2
-rw-r--r--src/corelib/tools/qhash.cpp4
-rw-r--r--src/corelib/tools/qline.cpp2
-rw-r--r--src/corelib/tools/qlist.qdoc4
-rw-r--r--src/corelib/tools/qmultimap.qdoc10
-rw-r--r--src/corelib/tools/qpair.qdoc2
-rw-r--r--src/corelib/tools/qscopedpointer.cpp6
-rw-r--r--src/corelib/tools/qsharedpointer.cpp2
21 files changed, 63 insertions, 63 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 56246783ed..94050d5595 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -4745,7 +4745,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*!
\macro qMove(x)
\relates <QtGlobal>
- \obsolete
+ \deprecated
Use \c std::move instead.
@@ -4850,7 +4850,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*!
\macro Q_DECL_OVERRIDE
\since 5.0
- \obsolete
+ \deprecated
\relates <QtGlobal>
This macro can be used to declare an overriding virtual
@@ -4870,7 +4870,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*!
\macro Q_DECL_FINAL
\since 5.0
- \obsolete
+ \deprecated
\relates <QtGlobal>
This macro can be used to declare an overriding virtual or a class
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index fccefa8008..740e32635f 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -531,7 +531,7 @@ void QLibraryInfoPrivate::keyAndDefault(QLibraryInfo::LibraryPath loc, QString *
}
/*! \fn QString QLibraryInfo::location(LibraryLocation loc)
- \obsolete Use path() instead.
+ \deprecated Use path() instead.
Returns the path specified by \a loc.
\sa path()
@@ -678,7 +678,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
/*!
\typealias QLibraryInfo::LibraryLocation
- \obsolete Use LibraryPath with QLibraryInfo::path() instead.
+ \deprecated Use LibraryPath with QLibraryInfo::path() instead.
*/
QT_END_NAMESPACE
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 1452c8eea8..be91d5f12d 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -3376,7 +3376,7 @@
#if QT_DEPRECATED_SINCE(6, 0)
/*!
\fn QKeyCombination::operator int() const noexcept
- \obsolete
+ \deprecated
Use toCombined() instead.
*/
@@ -3427,7 +3427,7 @@
\fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifier modifier) noexcept
\relates QKeyCombination
- \obsolete
+ \deprecated
Use operator| instead.
@@ -3442,7 +3442,7 @@
\fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifiers modifiers) noexcept
\relates QKeyCombination
- \obsolete
+ \deprecated
Use operator| instead.
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 43e633faaf..65745bf06a 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1728,12 +1728,12 @@ bool QMetaType::debugStream(QDebug& dbg, const void *rhs)
/*!
\fn bool QMetaType::debugStream(QDebug& dbg, const void *rhs, int typeId)
\overload
- \obsolete
+ \deprecated
*/
/*!
\fn bool QMetaType::hasRegisteredDebugStreamOperator()
- \obsolete
+ \deprecated
\since 5.2
Returns \c true, if the meta type system has a registered debug stream operator for type T.
@@ -1741,7 +1741,7 @@ bool QMetaType::debugStream(QDebug& dbg, const void *rhs)
/*!
\fn bool QMetaType::hasRegisteredDebugStreamOperator(int typeId)
- \obsolete Use QMetaType::hasRegisteredDebugStreamOperator() instead.
+ \deprecated Use QMetaType::hasRegisteredDebugStreamOperator() instead.
Returns \c true, if the meta type system has a registered debug stream operator for type
id \a typeId.
@@ -2174,7 +2174,7 @@ static bool convertQObject(QMetaType fromType, const void *from, QMetaType toTyp
/*!
\fn bool QMetaType::convert(const void *from, int fromTypeId, void *to, int toTypeId)
- \obsolete
+ \deprecated
Converts the object at \a from from \a fromTypeId to the preallocated space at \a to
typed \a toTypeId. Returns \c true, if the conversion succeeded, otherwise false.
@@ -2688,7 +2688,7 @@ bool QMetaType::save(QDataStream &stream, const void *data) const
/*!
\fn bool QMetaType::save(QDataStream &stream, int type, const void *data)
\overload
- \obsolete
+ \deprecated
*/
/*!
@@ -2746,7 +2746,7 @@ bool QMetaType::hasRegisteredDataStreamOperators() const
/*!
\fn bool QMetaType::load(QDataStream &stream, int type, void *data)
\overload
- \obsolete
+ \deprecated
*/
#endif // QT_NO_DATASTREAM
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index b115066dce..f3ea22d25d 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -1942,7 +1942,7 @@ void QObject::killTimer(int id)
\fn template<typename T> T qFindChild(const QObject *obj, const QString &name)
\relates QObject
\overload qFindChildren()
- \obsolete
+ \deprecated
This function is equivalent to
\a{obj}->\l{QObject::findChild()}{findChild}<T>(\a name).
@@ -1958,7 +1958,7 @@ void QObject::killTimer(int id)
\fn template<typename T> QList<T> qFindChildren(const QObject *obj, const QString &name)
\relates QObject
\overload qFindChildren()
- \obsolete
+ \deprecated
This function is equivalent to
\a{obj}->\l{QObject::findChildren()}{findChildren}<T>(\a name).
@@ -4283,7 +4283,7 @@ QDebug operator<<(QDebug dbg, const QObject *o)
/*!
\macro Q_ENUMS(...)
\relates QObject
- \obsolete
+ \deprecated
In new code, you should prefer the use of the Q_ENUM() macro, which makes the
type available also to the meta type system.
@@ -4303,7 +4303,7 @@ QDebug operator<<(QDebug dbg, const QObject *o)
/*!
\macro Q_FLAGS(...)
\relates QObject
- \obsolete
+ \deprecated
This macro registers one or several \l{QFlags}{flags types} with the
meta-object system. It is typically used in a class definition to declare
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index 8070d70a92..8d4052b8f9 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -206,7 +206,7 @@ QSocketNotifier::~QSocketNotifier()
/*!
\fn void QSocketNotifier::activated(int socket)
- \obsolete To avoid unintended truncation of the descriptor, use
+ \deprecated To avoid unintended truncation of the descriptor, use
the QSocketDescriptor overload of this function. If you need
compatibility with versions older than 5.15 you need to change
the slot to accept qintptr if it currently accepts an int, and
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 97623727a8..cd2c2b5910 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -379,7 +379,7 @@ static void customClear(QVariant::Private *d)
*/
/*!
- \obsolete Use QMetaType::Type instead
+ \deprecated Use QMetaType::Type instead.
\enum QVariant::Type
This enum type defines the types of variable that a QVariant can
@@ -1981,7 +1981,7 @@ QVariantList QVariant::toList() const
/*!
\fn bool QVariant::canConvert(int targetTypeId) const
\overload
- \obsolete
+ \deprecated
\sa QMetaType::canConvert()
*/
@@ -2000,7 +2000,7 @@ QVariantList QVariant::toList() const
/*!
\fn bool QVariant::convert(int targetTypeId)
- \obsolete
+ \deprecated
Casts the variant to the requested type, \a targetTypeId. If the cast cannot be
done, the variant is still changed to the requested type, but is left in a cleared
@@ -2651,7 +2651,7 @@ QT_WARNING_POP
/*! \fn template<typename T> T qVariantValue(const QVariant &value)
\relates QVariant
- \obsolete
+ \deprecated
Returns the given \a value converted to the template type \c{T}.
@@ -2667,7 +2667,7 @@ QT_WARNING_POP
/*! \fn bool qVariantCanConvert(const QVariant &value)
\relates QVariant
- \obsolete
+ \deprecated
Returns \c true if the given \a value can be converted to the
template type specified; otherwise returns \c false.
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 50e2b352f4..74eff267e3 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -1260,7 +1260,7 @@ QLocale::Territory QLocale::territory() const
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use territory() instead.
+ \deprecated Use territory() instead.
Returns the territory of this locale.
@@ -1407,7 +1407,7 @@ QLocale::Territory QLocale::codeToTerritory(QStringView territoryCode) noexcept
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use territoryToCode(Territory) instead.
+ \deprecated Use territoryToCode(Territory) instead.
Returns the two-letter territory code for \a country, as defined
in the ISO 3166 standard.
@@ -1427,7 +1427,7 @@ QString QLocale::countryToCode(Country country)
If the code is invalid or not known QLocale::AnyTerritory is returned.
- \obsolete Use codeToTerritory(QStringView) instead.
+ \deprecated Use codeToTerritory(QStringView) instead.
\since 6.1
\sa territoryToCode(), codeToLanguage(), codeToScript()
*/
@@ -1494,7 +1494,7 @@ QString QLocale::territoryToString(QLocale::Territory territory)
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use territoryToString(Territory) instead.
+ \deprecated Use territoryToString(Territory) instead.
Returns a QString containing the name of \a country.
@@ -2655,7 +2655,7 @@ QList<QLocale> QLocale::matchingLocales(QLocale::Language language, QLocale::Scr
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use matchingLocales() instead and consult the territory() of each.
+ \deprecated Use matchingLocales() instead and consult the territory() of each.
\since 4.3
Returns the list of countries that have entries for \a language in Qt's locale
@@ -4392,7 +4392,7 @@ QString QLocale::nativeTerritoryName() const
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use nativeTerritoryName() instead.
+ \deprecated Use nativeTerritoryName() instead.
\since 4.8
Returns a native name of the territory for the locale. For example
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index dc611db9e0..db6c1487c8 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -5395,7 +5395,7 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size)
/*!
\fn QString QString::fromUtf16(const ushort *str, qsizetype size)
- \obsolete
+ \deprecated
Use the \c char16_t overload.
*/
@@ -5403,7 +5403,7 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size)
/*!
\fn QString QString::fromUcs4(const uint *str, qsizetype size)
\since 4.2
- \obsolete
+ \deprecated
Use the \c char32_t overload instead.
*/
diff --git a/src/corelib/text/qstringview.cpp b/src/corelib/text/qstringview.cpp
index e003f257d7..eb141ca303 100644
--- a/src/corelib/text/qstringview.cpp
+++ b/src/corelib/text/qstringview.cpp
@@ -629,7 +629,7 @@ QT_BEGIN_NAMESPACE
Returns the substring of length \a length starting at position
\a start in this object.
- \obsolete Use sliced() instead in new code.
+ \deprecated Use sliced() instead in new code.
Returns an empty string view if \a start exceeds the
length of the string. If there are less than \a length characters
@@ -643,7 +643,7 @@ QT_BEGIN_NAMESPACE
/*!
\fn QStringView QStringView::left(qsizetype length) const
- \obsolete Use first() instead in new code.
+ \deprecated Use first() instead in new code.
Returns the substring of length \a length starting at position
0 in this object.
@@ -657,7 +657,7 @@ QT_BEGIN_NAMESPACE
/*!
\fn QStringView QStringView::right(qsizetype length) const
- \obsolete Use last() instead in new code.
+ \deprecated Use last() instead in new code.
Returns the substring of length \a length starting at position
size() - \a length in this object.
diff --git a/src/corelib/text/qutf8stringview.qdoc b/src/corelib/text/qutf8stringview.qdoc
index e02bf5ab89..25048ab424 100644
--- a/src/corelib/text/qutf8stringview.qdoc
+++ b/src/corelib/text/qutf8stringview.qdoc
@@ -558,7 +558,7 @@
Returns the substring of length \a n starting at position
\a pos in this object.
- \obsolete Use sliced() instead in new code.
+ \deprecated Use sliced() instead in new code.
Returns an empty string view if \a n exceeds the
length of the string. If there are less than \a n code points
@@ -572,7 +572,7 @@
/*!
\fn QUtf8StringView::left(qsizetype n) const
- \obsolete Use first() instead in new code.
+ \deprecated Use first() instead in new code.
Returns the substring of length \a n starting at position
0 in this object.
@@ -586,7 +586,7 @@
/*!
\fn QUtf8StringView::right(qsizetype n) const
- \obsolete Use last() instead in new code.
+ \deprecated Use last() instead in new code.
Returns the substring of length \a n starting at position
size() - \a n in this object.
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc
index fd3120ff15..edaba61490 100644
--- a/src/corelib/thread/qfuture.qdoc
+++ b/src/corelib/thread/qfuture.qdoc
@@ -202,7 +202,7 @@
#if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFuture<T>::setPaused(bool paused)
- \obsolete
+ \deprecated
Use setSuspended() instead.
If \a paused is true, this function pauses the asynchronous computation
@@ -224,7 +224,7 @@
/*! \fn template <typename T> bool QFuture<T>::isPaused() const
- \obsolete
+ \deprecated
Use isSuspending() or isSuspended() instead.
Returns \c true if the asynchronous computation has been paused with the
@@ -239,7 +239,7 @@
/*! \fn template <typename T> void QFuture<T>::pause()
- \obsolete
+ \deprecated
Use suspend() instead.
Pauses the asynchronous computation represented by this future. This is a
@@ -250,7 +250,7 @@
/*! \fn template <typename T> void QFuture<T>::togglePaused()
- \obsolete
+ \deprecated
Use toggleSuspended() instead.
Toggles the paused state of the asynchronous computation. In other words,
diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp
index d59b6755a4..9ee6b41e5d 100644
--- a/src/corelib/thread/qfuturewatcher.cpp
+++ b/src/corelib/thread/qfuturewatcher.cpp
@@ -136,7 +136,7 @@ void QFutureWatcherBase::cancel()
#if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::setPaused(bool paused)
- \obsolete
+ \deprecated
Use setSuspended() instead.
If \a paused is true, this function pauses the asynchronous computation
@@ -163,7 +163,7 @@ void QFutureWatcherBase::setPaused(bool paused)
/*! \fn template <typename T> void QFutureWatcher<T>::pause()
- \obsolete
+ \deprecated
Use suspend() instead.
Pauses the asynchronous computation represented by the future(). This is a
@@ -233,7 +233,7 @@ void QFutureWatcherBase::resume()
#if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::togglePaused()
- \obsolete
+ \deprecated
Use toggleSuspended() instead.
Toggles the paused state of the asynchronous computation. In other words,
@@ -360,7 +360,7 @@ bool QFutureWatcherBase::isCanceled() const
/*! \fn template <typename T> bool QFutureWatcher<T>::isPaused() const
- \obsolete
+ \deprecated
Use isSuspending() or isSuspended() instead.
Returns \c true if the asynchronous computation has been paused with the
@@ -665,7 +665,7 @@ QT_WARNING_POP
#if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::paused()
- \obsolete
+ \deprecated
Use suspending() instead.
This signal is emitted when the state of the watched future is
diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index 74c09fb927..1aad2a3f06 100644
--- a/src/corelib/time/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
@@ -502,7 +502,7 @@ QLocale::Territory QTimeZone::territory() const
#if QT_DEPRECATED_SINCE(6, 6)
/*!
- \obsolete Use territory() instead.
+ \deprecated Use territory() instead.
Returns the territory for the time zone.
*/
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index dcb90a530d..743093bc4e 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -878,7 +878,7 @@ void QHashSeed::resetRandomGlobalSeed()
#if QT_DEPRECATED_SINCE(6,6)
/*! \relates QHash
\since 5.6
- \obsolete Use QHashSeed::globalSeed() instead.
+ \deprecated Use QHashSeed::globalSeed() instead.
Returns the current global QHash seed.
@@ -894,7 +894,7 @@ int qGlobalQHashSeed()
/*! \relates QHash
\since 5.6
- \obsolete Use QHashSeed instead.
+ \deprecated Use QHashSeed instead.
Sets the global QHash seed to \a newSeed.
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index f90dc1785a..bbedfa948e 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -366,7 +366,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
/*!
\typealias QLineF::IntersectType
- \obsolete Use QLineF::IntersectionType instead.
+ \deprecated Use QLineF::IntersectionType instead.
*/
/*!
diff --git a/src/corelib/tools/qlist.qdoc b/src/corelib/tools/qlist.qdoc
index 2fcc088f0a..88c8ca3dc5 100644
--- a/src/corelib/tools/qlist.qdoc
+++ b/src/corelib/tools/qlist.qdoc
@@ -1509,7 +1509,7 @@
/*! \fn template <typename T> QList<T> QList<T>::toList() const
\fn template <typename T> QList<T> QList<T>::toVector() const
- \obsolete
+ \deprecated
A no-op in Qt 6. Provided for backwards compatibility with
Qt 5, where QList and QVector where two different types.
@@ -1519,7 +1519,7 @@
/*! \fn template <typename T> QList<T> QList<T>::fromList(const QList<T> &list)
\fn template <typename T> QList<T> QList<T>::fromVector(const QList<T> &list)
- \obsolete
+ \deprecated
A no-op in Qt 6. Provided for backwards compatibility with
Qt 5, where QList and QVector were two different types.
diff --git a/src/corelib/tools/qmultimap.qdoc b/src/corelib/tools/qmultimap.qdoc
index d3af4e7973..a57708b261 100644
--- a/src/corelib/tools/qmultimap.qdoc
+++ b/src/corelib/tools/qmultimap.qdoc
@@ -241,7 +241,7 @@
*/
/*! \fn template <class Key, class T> std::multimap<Key, T> QMultiMap<Key, T>::toStdMap() const
- \obsolete Use toStdMultiMap() instead.
+ \deprecated Use toStdMultiMap() instead.
Returns an STL multi map equivalent to this QMultiMap.
*/
@@ -858,13 +858,13 @@
#if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <class Key, class T> QMultiMap<Key, T>::iterator QMultiMap<Key, T>::insertMulti(const Key &key, const T &value)
- \obsolete Use insert() instead.
+ \deprecated Use insert() instead.
Inserts a new item with the key \a key and a value of \a value, and returns an iterator pointing to the new item.
*/
/*! \fn template <class Key, class T> QMultiMap<Key, T>::iterator QMultiMap<Key, T>::insertMulti(const_iterator pos, const Key &key, const T &value)
- \obsolete Use insert() instead.
+ \deprecated Use insert() instead.
\overload
Inserts a new item with the key \a key and value \a value and with hint \a pos
@@ -873,14 +873,14 @@
/*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(const QMultiMap<Key, T> &map)
\since 5.15
- \obsolete Use unite() instead.
+ \deprecated Use unite() instead.
Inserts all the items in \a map into this map.
*/
/*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(QMultiMap<Key, T> &&map)
\since 5.15
- \obsolete Use unite() instead.
+ \deprecated Use unite() instead.
\overload
Moves all the items from \a map into this map.
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index d1c49fc520..3cd1beec18 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -34,7 +34,7 @@
/*!
\fn template <class T1, class T2> QPair<T1, T2> qMakePair(T1 &&value1, T2 &&value2)
- \obsolete
+ \deprecated
\relates QPair
qMakePair forwards its arguments to std::make_pair, and returns
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 40d08b9653..8146fe33cf 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -248,7 +248,7 @@ QT_BEGIN_NAMESPACE
/*!
\fn template <typename T, typename Cleanup> T *QScopedPointer<T, Cleanup>::take()
- \obsolete Use std::unique_ptr and release() instead.
+ \deprecated Use std::unique_ptr and release() instead.
Returns the value of the pointer referenced by this object. The pointer of this
QScopedPointer object will be reset to \nullptr.
@@ -265,7 +265,7 @@ QT_BEGIN_NAMESPACE
/*! \fn template <typename T, typename Cleanup> void QScopedPointer<T, Cleanup>::swap(QScopedPointer<T, Cleanup> &lhs, QScopedPointer<T, Cleanup> &rhs)
- \obsolete Use std::unique_ptr instead; this function may let a pointer
+ \deprecated Use std::unique_ptr instead; this function may let a pointer
escape its scope.
Swaps \a lhs with \a rhs.
@@ -335,7 +335,7 @@ QT_BEGIN_NAMESPACE
/*! \fn template <typename T, typename Cleanup> void QScopedArrayPointer<T, Cleanup>::swap(QScopedArrayPointer<T, Cleanup> &other)
- \obsolete Use std::unique_ptr instead; this function may let a pointer
+ \deprecated Use std::unique_ptr instead; this function may let a pointer
escape its scope.
Swap this pointer with \a other.
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index ef921a8284..bd4d6c906b 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -848,7 +848,7 @@
/*!
\fn template <class T> T *QWeakPointer<T>::data() const
\since 4.6
- \obsolete Use toStrongRef() instead, and data() on the returned QSharedPointer.
+ \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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 06:26:51 +0000