1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Use \deprecated instead of \obsolete

Browse Source 
Task-number: QTBUG-93990
Change-Id: I4e512354a49dde6678ca89cabc56bc76ba666bb3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Paul Wicking 2021-05-25 15:04:48 +02:00
parent ae02188233
commit a1dfe27955
47 changed files with 130 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qglobal.cpp
View File

@ -4745,7 +4745,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*! /*!
\macro qMove(x) \macro qMove(x)
\relates <QtGlobal> \relates <QtGlobal>
\obsolete \deprecated
Use \c std::move instead. Use \c std::move instead.
@ -4850,7 +4850,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*! /*!
\macro Q_DECL_OVERRIDE \macro Q_DECL_OVERRIDE
\since 5.0 \since 5.0
\obsolete \deprecated
\relates <QtGlobal> \relates <QtGlobal>
This macro can be used to declare an overriding virtual 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 \macro Q_DECL_FINAL
\since 5.0 \since 5.0
\obsolete \deprecated
\relates <QtGlobal> \relates <QtGlobal>
This macro can be used to declare an overriding virtual or a class This macro can be used to declare an overriding virtual or a class

4
src/corelib/global/qlibraryinfo.cpp
View File

@ -531,7 +531,7 @@ void QLibraryInfoPrivate::keyAndDefault(QLibraryInfo::LibraryPath loc, QString *
} }
/*! \fn QString QLibraryInfo::location(LibraryLocation loc) /*! \fn QString QLibraryInfo::location(LibraryLocation loc)
\obsolete Use path() instead. \deprecated Use path() instead.
Returns the path specified by \a loc. Returns the path specified by \a loc.
\sa path() \sa path()
@ -678,7 +678,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
/*! /*!
\typealias QLibraryInfo::LibraryLocation \typealias QLibraryInfo::LibraryLocation
\obsolete Use LibraryPath with QLibraryInfo::path() instead. \deprecated Use LibraryPath with QLibraryInfo::path() instead.
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE

6
src/corelib/global/qnamespace.qdoc
View File

@ -3376,7 +3376,7 @@
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! /*!
\fn QKeyCombination::operator int() const noexcept \fn QKeyCombination::operator int() const noexcept
\obsolete \deprecated
Use toCombined() instead. Use toCombined() instead.
*/ */
@ -3427,7 +3427,7 @@
\fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifier modifier) noexcept \fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifier modifier) noexcept
\relates QKeyCombination \relates QKeyCombination
\obsolete \deprecated
Use operator| instead. Use operator| instead.
@ -3442,7 +3442,7 @@
\fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifiers modifiers) noexcept \fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifiers modifiers) noexcept
\relates QKeyCombination \relates QKeyCombination
\obsolete \deprecated
Use operator| instead. Use operator| instead.

12
src/corelib/kernel/qmetatype.cpp
View File

@ -1728,12 +1728,12 @@ bool QMetaType::debugStream(QDebug& dbg, const void *rhs)
/*! /*!
\fn bool QMetaType::debugStream(QDebug& dbg, const void *rhs, int typeId) \fn bool QMetaType::debugStream(QDebug& dbg, const void *rhs, int typeId)
\overload \overload
\obsolete \deprecated
*/ */
/*! /*!
\fn bool QMetaType::hasRegisteredDebugStreamOperator() \fn bool QMetaType::hasRegisteredDebugStreamOperator()
\obsolete \deprecated
\since 5.2 \since 5.2
Returns \c true, if the meta type system has a registered debug stream operator for type T. 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) \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 Returns \c true, if the meta type system has a registered debug stream operator for type
id \a typeId. 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) \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 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. 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) \fn bool QMetaType::save(QDataStream &stream, int type, const void *data)
\overload \overload
\obsolete \deprecated
*/ */
/*! /*!
@ -2746,7 +2746,7 @@ bool QMetaType::hasRegisteredDataStreamOperators() const
/*! /*!
\fn bool QMetaType::load(QDataStream &stream, int type, void *data) \fn bool QMetaType::load(QDataStream &stream, int type, void *data)
\overload \overload
\obsolete \deprecated
*/ */
#endif // QT_NO_DATASTREAM #endif // QT_NO_DATASTREAM

8
src/corelib/kernel/qobject.cpp
View File

@ -1942,7 +1942,7 @@ void QObject::killTimer(int id)
\fn template<typename T> T qFindChild(const QObject *obj, const QString &name) \fn template<typename T> T qFindChild(const QObject *obj, const QString &name)
\relates QObject \relates QObject
\overload qFindChildren() \overload qFindChildren()
\obsolete \deprecated
This function is equivalent to This function is equivalent to
\a{obj}->\l{QObject::findChild()}{findChild}<T>(\a name). \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) \fn template<typename T> QList<T> qFindChildren(const QObject *obj, const QString &name)
\relates QObject \relates QObject
\overload qFindChildren() \overload qFindChildren()
\obsolete \deprecated
This function is equivalent to This function is equivalent to
\a{obj}->\l{QObject::findChildren()}{findChildren}<T>(\a name). \a{obj}->\l{QObject::findChildren()}{findChildren}<T>(\a name).
@ -4283,7 +4283,7 @@ QDebug operator<<(QDebug dbg, const QObject *o)
/*! /*!
\macro Q_ENUMS(...) \macro Q_ENUMS(...)
\relates QObject \relates QObject
\obsolete \deprecated
In new code, you should prefer the use of the Q_ENUM() macro, which makes the In new code, you should prefer the use of the Q_ENUM() macro, which makes the
type available also to the meta type system. type available also to the meta type system.
@ -4303,7 +4303,7 @@ QDebug operator<<(QDebug dbg, const QObject *o)
/*! /*!
\macro Q_FLAGS(...) \macro Q_FLAGS(...)
\relates QObject \relates QObject
\obsolete \deprecated
This macro registers one or several \l{QFlags}{flags types} with the 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 meta-object system. It is typically used in a class definition to declare

2
src/corelib/kernel/qsocketnotifier.cpp
View File

@ -206,7 +206,7 @@ QSocketNotifier::~QSocketNotifier()
/*! /*!
\fn void QSocketNotifier::activated(int socket) \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 the QSocketDescriptor overload of this function. If you need
compatibility with versions older than 5.15 you need to change compatibility with versions older than 5.15 you need to change
the slot to accept qintptr if it currently accepts an int, and the slot to accept qintptr if it currently accepts an int, and

10
src/corelib/kernel/qvariant.cpp
View File

@ -379,7 +379,7 @@ static void customClear(QVariant::Private *d)
*/ */
/*! /*!
\obsolete Use QMetaType::Type instead \deprecated Use QMetaType::Type instead.
\enum QVariant::Type \enum QVariant::Type
This enum type defines the types of variable that a QVariant can 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 \fn bool QVariant::canConvert(int targetTypeId) const
\overload \overload
\obsolete \deprecated
\sa QMetaType::canConvert() \sa QMetaType::canConvert()
*/ */
@ -2000,7 +2000,7 @@ QVariantList QVariant::toList() const
/*! /*!
\fn bool QVariant::convert(int targetTypeId) \fn bool QVariant::convert(int targetTypeId)
\obsolete \deprecated
Casts the variant to the requested type, \a targetTypeId. If the cast cannot be 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 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) /*! \fn template<typename T> T qVariantValue(const QVariant &value)
\relates QVariant \relates QVariant
\obsolete \deprecated
Returns the given \a value converted to the template type \c{T}. 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) /*! \fn bool qVariantCanConvert(const QVariant &value)
\relates QVariant \relates QVariant
\obsolete \deprecated
Returns \c true if the given \a value can be converted to the Returns \c true if the given \a value can be converted to the
template type specified; otherwise returns \c false. template type specified; otherwise returns \c false.

12
src/corelib/text/qlocale.cpp
View File

@ -1260,7 +1260,7 @@ QLocale::Territory QLocale::territory() const
#if QT_DEPRECATED_SINCE(6, 6) #if QT_DEPRECATED_SINCE(6, 6)
/*! /*!
\obsolete Use territory() instead. \deprecated Use territory() instead.
Returns the territory of this locale. Returns the territory of this locale.
@ -1407,7 +1407,7 @@ QLocale::Territory QLocale::codeToTerritory(QStringView territoryCode) noexcept
#if QT_DEPRECATED_SINCE(6, 6) #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 Returns the two-letter territory code for \a country, as defined
in the ISO 3166 standard. 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. 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 \since 6.1
\sa territoryToCode(), codeToLanguage(), codeToScript() \sa territoryToCode(), codeToLanguage(), codeToScript()
*/ */
@ -1494,7 +1494,7 @@ QString QLocale::territoryToString(QLocale::Territory territory)
#if QT_DEPRECATED_SINCE(6, 6) #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. 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) #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 \since 4.3
Returns the list of countries that have entries for \a language in Qt's locale 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) #if QT_DEPRECATED_SINCE(6, 6)
/*! /*!
\obsolete Use nativeTerritoryName() instead. \deprecated Use nativeTerritoryName() instead.
\since 4.8 \since 4.8
Returns a native name of the territory for the locale. For example Returns a native name of the territory for the locale. For example

4
src/corelib/text/qstring.cpp
View File

@ -5395,7 +5395,7 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size)
/*! /*!
\fn QString QString::fromUtf16(const ushort *str, qsizetype size) \fn QString QString::fromUtf16(const ushort *str, qsizetype size)
\obsolete \deprecated
Use the \c char16_t overload. 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) \fn QString QString::fromUcs4(const uint *str, qsizetype size)
\since 4.2 \since 4.2
\obsolete \deprecated
Use the \c char32_t overload instead. Use the \c char32_t overload instead.
*/ */

6
src/corelib/text/qstringview.cpp
View File

@ -629,7 +629,7 @@ QT_BEGIN_NAMESPACE
Returns the substring of length \a length starting at position Returns the substring of length \a length starting at position
\a start in this object. \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 Returns an empty string view if \a start exceeds the
length of the string. If there are less than \a length characters 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 \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 Returns the substring of length \a length starting at position
0 in this object. 0 in this object.
@ -657,7 +657,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\fn QStringView QStringView::right(qsizetype length) const \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 Returns the substring of length \a length starting at position
size() - \a length in this object. size() - \a length in this object.

6
src/corelib/text/qutf8stringview.qdoc
View File

@ -558,7 +558,7 @@
Returns the substring of length \a n starting at position Returns the substring of length \a n starting at position
\a pos in this object. \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 Returns an empty string view if \a n exceeds the
length of the string. If there are less than \a n code points length of the string. If there are less than \a n code points
@ -572,7 +572,7 @@
/*! /*!
\fn QUtf8StringView::left(qsizetype n) const \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 Returns the substring of length \a n starting at position
0 in this object. 0 in this object.
@ -586,7 +586,7 @@
/*! /*!
\fn QUtf8StringView::right(qsizetype n) const \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 Returns the substring of length \a n starting at position
size() - \a n in this object. size() - \a n in this object.

8
src/corelib/thread/qfuture.qdoc
View File

@ -202,7 +202,7 @@
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFuture<T>::setPaused(bool paused) /*! \fn template <typename T> void QFuture<T>::setPaused(bool paused)
\obsolete \deprecated
Use setSuspended() instead. Use setSuspended() instead.
If \a paused is true, this function pauses the asynchronous computation If \a paused is true, this function pauses the asynchronous computation
@ -224,7 +224,7 @@
/*! \fn template <typename T> bool QFuture<T>::isPaused() const /*! \fn template <typename T> bool QFuture<T>::isPaused() const
\obsolete \deprecated
Use isSuspending() or isSuspended() instead. Use isSuspending() or isSuspended() instead.
Returns \c true if the asynchronous computation has been paused with the Returns \c true if the asynchronous computation has been paused with the
@ -239,7 +239,7 @@
/*! \fn template <typename T> void QFuture<T>::pause() /*! \fn template <typename T> void QFuture<T>::pause()
\obsolete \deprecated
Use suspend() instead. Use suspend() instead.
Pauses the asynchronous computation represented by this future. This is a Pauses the asynchronous computation represented by this future. This is a
@ -250,7 +250,7 @@
/*! \fn template <typename T> void QFuture<T>::togglePaused() /*! \fn template <typename T> void QFuture<T>::togglePaused()
\obsolete \deprecated
Use toggleSuspended() instead. Use toggleSuspended() instead.
Toggles the paused state of the asynchronous computation. In other words, Toggles the paused state of the asynchronous computation. In other words,

10
src/corelib/thread/qfuturewatcher.cpp
View File

@ -136,7 +136,7 @@ void QFutureWatcherBase::cancel()
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::setPaused(bool paused) /*! \fn template <typename T> void QFutureWatcher<T>::setPaused(bool paused)
\obsolete \deprecated
Use setSuspended() instead. Use setSuspended() instead.
If \a paused is true, this function pauses the asynchronous computation 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() /*! \fn template <typename T> void QFutureWatcher<T>::pause()
\obsolete \deprecated
Use suspend() instead. Use suspend() instead.
Pauses the asynchronous computation represented by the future(). This is a Pauses the asynchronous computation represented by the future(). This is a
@ -233,7 +233,7 @@ void QFutureWatcherBase::resume()
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::togglePaused() /*! \fn template <typename T> void QFutureWatcher<T>::togglePaused()
\obsolete \deprecated
Use toggleSuspended() instead. Use toggleSuspended() instead.
Toggles the paused state of the asynchronous computation. In other words, 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 /*! \fn template <typename T> bool QFutureWatcher<T>::isPaused() const
\obsolete \deprecated
Use isSuspending() or isSuspended() instead. Use isSuspending() or isSuspended() instead.
Returns \c true if the asynchronous computation has been paused with the 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) #if QT_DEPRECATED_SINCE(6, 0)
/*! \fn template <typename T> void QFutureWatcher<T>::paused() /*! \fn template <typename T> void QFutureWatcher<T>::paused()
\obsolete \deprecated
Use suspending() instead. Use suspending() instead.
This signal is emitted when the state of the watched future is This signal is emitted when the state of the watched future is

2
src/corelib/time/qtimezone.cpp
View File

@ -502,7 +502,7 @@ QLocale::Territory QTimeZone::territory() const
#if QT_DEPRECATED_SINCE(6, 6) #if QT_DEPRECATED_SINCE(6, 6)
/*! /*!
\obsolete Use territory() instead. \deprecated Use territory() instead.
Returns the territory for the time zone. Returns the territory for the time zone.
*/ */

4
src/corelib/tools/qhash.cpp
View File

@ -878,7 +878,7 @@ void QHashSeed::resetRandomGlobalSeed()
#if QT_DEPRECATED_SINCE(6,6) #if QT_DEPRECATED_SINCE(6,6)
/*! \relates QHash /*! \relates QHash
\since 5.6 \since 5.6
\obsolete Use QHashSeed::globalSeed() instead. \deprecated Use QHashSeed::globalSeed() instead.
Returns the current global QHash seed. Returns the current global QHash seed.
@ -894,7 +894,7 @@ int qGlobalQHashSeed()
/*! \relates QHash /*! \relates QHash
\since 5.6 \since 5.6
\obsolete Use QHashSeed instead. \deprecated Use QHashSeed instead.
Sets the global QHash seed to \a newSeed. Sets the global QHash seed to \a newSeed.

2
src/corelib/tools/qline.cpp
View File

@ -366,7 +366,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
/*! /*!
\typealias QLineF::IntersectType \typealias QLineF::IntersectType
\obsolete Use QLineF::IntersectionType instead. \deprecated Use QLineF::IntersectionType instead.
*/ */
/*! /*!

4
src/corelib/tools/qlist.qdoc
View File

@ -1509,7 +1509,7 @@
/*! \fn template <typename T> QList<T> QList<T>::toList() const /*! \fn template <typename T> QList<T> QList<T>::toList() const
\fn template <typename T> QList<T> QList<T>::toVector() const \fn template <typename T> QList<T> QList<T>::toVector() const
\obsolete \deprecated
A no-op in Qt 6. Provided for backwards compatibility with A no-op in Qt 6. Provided for backwards compatibility with
Qt 5, where QList and QVector where two different types. 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>::fromList(const QList<T> &list)
\fn template <typename T> QList<T> QList<T>::fromVector(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 A no-op in Qt 6. Provided for backwards compatibility with
Qt 5, where QList and QVector were two different types. Qt 5, where QList and QVector were two different types.

10
src/corelib/tools/qmultimap.qdoc
View File

@ -241,7 +241,7 @@
*/ */
/*! \fn template <class Key, class T> std::multimap<Key, T> QMultiMap<Key, T>::toStdMap() const /*! \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. Returns an STL multi map equivalent to this QMultiMap.
*/ */
@ -858,13 +858,13 @@
#if QT_DEPRECATED_SINCE(6, 0) #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) /*! \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. 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) /*! \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 \overload
Inserts a new item with the key \a key and value \a value and with hint \a pos 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) /*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(const QMultiMap<Key, T> &map)
\since 5.15 \since 5.15
\obsolete Use unite() instead. \deprecated Use unite() instead.
Inserts all the items in \a map into this map. 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) /*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(QMultiMap<Key, T> &&map)
\since 5.15 \since 5.15
\obsolete Use unite() instead. \deprecated Use unite() instead.
\overload \overload
Moves all the items from \a map into this map. Moves all the items from \a map into this map.

2
src/corelib/tools/qpair.qdoc
View File

@ -34,7 +34,7 @@
/*! /*!
\fn template <class T1, class T2> QPair<T1, T2> qMakePair(T1 &&value1, T2 &&value2) \fn template <class T1, class T2> QPair<T1, T2> qMakePair(T1 &&value1, T2 &&value2)
\obsolete \deprecated
\relates QPair \relates QPair
qMakePair forwards its arguments to std::make_pair, and returns qMakePair forwards its arguments to std::make_pair, and returns

6
src/corelib/tools/qscopedpointer.cpp
View File

@ -248,7 +248,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\fn template <typename T, typename Cleanup> T *QScopedPointer<T, Cleanup>::take() \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 Returns the value of the pointer referenced by this object. The pointer of this
QScopedPointer object will be reset to \nullptr. 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) /*! \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. escape its scope.
Swaps \a lhs with \a rhs. 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) /*! \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. escape its scope.
Swap this pointer with \a other. Swap this pointer with \a other.

2
src/corelib/tools/qsharedpointer.cpp
View File

@ -848,7 +848,7 @@
/*! /*!
\fn template <class T> T *QWeakPointer<T>::data() const \fn template <class T> T *QWeakPointer<T>::data() const
\since 4.6 \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, Returns the value of the pointer being tracked by this QWeakPointer,
\b without ensuring that it cannot get deleted. To have that guarantee, \b without ensuring that it cannot get deleted. To have that guarantee,

4
src/gui/image/qbitmap.cpp
View File

@ -277,7 +277,7 @@ QBitmap QBitmap::fromPixmap(const QPixmap &pixmap)
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! /*!
\obsolete Use fromPixmap instead. \deprecated Use fromPixmap instead.
Constructs a bitmap that is a copy of the given \a pixmap. Constructs a bitmap that is a copy of the given \a pixmap.
If the pixmap has a depth greater than 1, the resulting bitmap If the pixmap has a depth greater than 1, the resulting bitmap
@ -292,7 +292,7 @@ QBitmap::QBitmap(const QPixmap &pixmap)
} }
/*! /*!
\obsolete Use fromPixmap instead. \deprecated Use fromPixmap instead.
\overload \overload
Assigns the given \a pixmap to this bitmap and returns a reference Assigns the given \a pixmap to this bitmap and returns a reference

2
src/gui/image/qicon.cpp
View File

@ -885,7 +885,7 @@ QPixmap QIcon::pixmap(const QSize &size, qreal devicePixelRatio, Mode mode, Stat
a high-dpi display the pixmap can be larger. In that case it will have a high-dpi display the pixmap can be larger. In that case it will have
a devicePixelRatio larger than 1. a devicePixelRatio larger than 1.
\obsolete Use the overload which takes qreal devicePixelRatio instead. \deprecated Use the overload which takes qreal devicePixelRatio instead.
\sa actualSize(), paint() \sa actualSize(), paint()
*/ */

10
src/gui/kernel/qaction.cpp
View File

@ -548,14 +548,14 @@ QList<QObject*> QAction::associatedObjects() const
/*! /*!
\fn QWidget *QAction::parentWidget() const \fn QWidget *QAction::parentWidget() const
\obsolete Use parent() with qobject_cast() instead. \deprecated Use parent() with qobject_cast() instead.
Returns the parent widget. Returns the parent widget.
*/ */
/*! /*!
\fn QList<QWidget*> QAction::associatedWidgets() const \fn QList<QWidget*> QAction::associatedWidgets() const
\obsolete Use associatedObjects() with qobject_cast() instead. \deprecated Use associatedObjects() with qobject_cast() instead.
Returns a list of widgets this action has been added to. Returns a list of widgets this action has been added to.
@ -564,7 +564,7 @@ QList<QObject*> QAction::associatedObjects() const
/*! /*!
\fn QList<QWidget*> QAction::associatedGraphicsWidgets() const \fn QList<QWidget*> QAction::associatedGraphicsWidgets() const
\obsolete Use associatedObjects() with qobject_cast() instead. \deprecated Use associatedObjects() with qobject_cast() instead.
Returns a list of graphics widgets this action has been added to. Returns a list of graphics widgets this action has been added to.
@ -1225,7 +1225,7 @@ QAction::MenuRole QAction::menuRole() const
/*! /*!
\fn QMenu *QAction::menu() const \fn QMenu *QAction::menu() const
\obsolete \deprecated
Returns the menu contained by this action. Returns the menu contained by this action.
@ -1242,7 +1242,7 @@ QObject* QAction::menuObject() const
/*! /*!
\fn void QAction::setMenu(QMenu *menu) \fn void QAction::setMenu(QMenu *menu)
\obsolete \deprecated
Sets the menu contained by this action to the specified \a menu. Sets the menu contained by this action to the specified \a menu.
*/ */

4
src/gui/kernel/qcursor.cpp
View File

@ -565,7 +565,7 @@ void QCursor::setShape(Qt::CursorShape shape)
/*! /*!
\fn QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const \fn QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const
\since 5.15 \since 5.15
\obsolete Use the overload without argument instead. \deprecated Use the overload without argument instead.
Returns the cursor bitmap, or a null bitmap if it is one of the Returns the cursor bitmap, or a null bitmap if it is one of the
standard cursors. standard cursors.
@ -592,7 +592,7 @@ QBitmap QCursor::bitmap() const
/*! /*!
\fn QBitmap QCursor::mask(Qt::ReturnByValueConstant) const \fn QBitmap QCursor::mask(Qt::ReturnByValueConstant) const
\since 5.15 \since 5.15
\obsolete Use the overload without argument instead. \deprecated Use the overload without argument instead.
Returns the cursor bitmap mask, or a null bitmap if it is one of the Returns the cursor bitmap mask, or a null bitmap if it is one of the
standard cursors. standard cursors.

6
src/gui/kernel/qevent.cpp
View File

@ -2770,7 +2770,7 @@ QTabletEvent::~QTabletEvent()
*/ */
/*! /*!
\obsolete \deprecated
Use the other constructor, because \a intValue is no longer stored separately. Use the other constructor, because \a intValue is no longer stored separately.
Constructs a native gesture event of type \a type originating from \a device. Constructs a native gesture event of type \a type originating from \a device.
@ -4462,7 +4462,7 @@ QTouchEvent::QTouchEvent(QEvent::Type eventType,
} }
/*! /*!
\obsolete \deprecated
Try to use another constructor, because \a touchPointStates Try to use another constructor, because \a touchPointStates
can be calculated from the given \a touchPoints. can be calculated from the given \a touchPoints.
@ -4527,7 +4527,7 @@ bool QTouchEvent::isEndEvent() const
*/ */
/*! \fn const QList<QEventPoint> &QTouchEvent::touchPoints() const /*! \fn const QList<QEventPoint> &QTouchEvent::touchPoints() const
\obsolete \deprecated
Deprecated since Qt 6.0. Use points() instead. Deprecated since Qt 6.0. Use points() instead.
Returns a reference to the list of touch points contained in the touch event. Returns a reference to the list of touch points contained in the touch event.

8
src/gui/kernel/qeventpoint.cpp
View File

@ -142,7 +142,7 @@ bool QEventPoint::operator==(const QEventPoint &other) const noexcept
QEventPoint::~QEventPoint() = default; QEventPoint::~QEventPoint() = default;
/*! \fn QPointF QEventPoint::pos() const /*! \fn QPointF QEventPoint::pos() const
\obsolete \deprecated
Deprecated since Qt 6.0. Use position() instead. Deprecated since Qt 6.0. Use position() instead.
Returns the position of this point, relative to the widget Returns the position of this point, relative to the widget
@ -443,7 +443,7 @@ bool QEventPoint::isAccepted() const
/*! /*!
\obsolete \deprecated
\fn QPointF QEventPoint::normalizedPos() const \fn QPointF QEventPoint::normalizedPos() const
Deprecated since Qt 6.0. Use normalizedPosition() instead. Deprecated since Qt 6.0. Use normalizedPosition() instead.
@ -470,7 +470,7 @@ QPointF QEventPoint::normalizedPosition() const
} }
/*! /*!
\obsolete \deprecated
Deprecated since Qt 6.0. Use globalPressPosition() instead. Deprecated since Qt 6.0. Use globalPressPosition() instead.
Returns the normalized press position of this point. Returns the normalized press position of this point.
@ -487,7 +487,7 @@ QPointF QEventPoint::startNormalizedPos() const
} }
/*! /*!
\obsolete \deprecated
Deprecated since Qt 6.0. Use globalLastPosition() instead. Deprecated since Qt 6.0. Use globalLastPosition() instead.
Returns the normalized position of this point from the previous press or Returns the normalized position of this point from the previous press or

4
src/gui/kernel/qguiapplication.cpp
View File

@ -3285,7 +3285,7 @@ QClipboard * QGuiApplication::clipboard()
/*! /*!
\since 5.4 \since 5.4
\fn void QGuiApplication::paletteChanged(const QPalette &palette) \fn void QGuiApplication::paletteChanged(const QPalette &palette)
\obsolete \deprecated
This signal is emitted when the \a palette of the application changes. Use This signal is emitted when the \a palette of the application changes. Use
QEvent::ApplicationPaletteChanged instead. QEvent::ApplicationPaletteChanged instead.
@ -3396,7 +3396,7 @@ void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
/*! /*!
\since 5.11 \since 5.11
\fn void QGuiApplication::fontChanged(const QFont &font) \fn void QGuiApplication::fontChanged(const QFont &font)
\obsolete \deprecated
This signal is emitted when the \a font of the application changes. Use This signal is emitted when the \a font of the application changes. Use
QEvent::ApplicationFontChanged instead. QEvent::ApplicationFontChanged instead.

3
src/gui/kernel/qpalette.cpp
View File

@ -595,7 +595,8 @@ QPalette::QPalette(const QBrush &windowText, const QBrush &button,
} }
/*!\obsolete /*!
\deprecated
Constructs a palette with the specified \a windowText, \a Constructs a palette with the specified \a windowText, \a
window, \a light, \a dark, \a mid, \a text, and \a base colors. window, \a light, \a dark, \a mid, \a text, and \a base colors.

8
src/gui/math3d/qmatrix4x4.cpp
View File

@ -633,7 +633,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor)
\fn QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) \fn QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix)
\relates QMatrix4x4 \relates QMatrix4x4
\obsolete Convert the QVector3D to a QVector4D first, then multiply. \deprecated Convert the QVector3D to a QVector4D first, then multiply.
Returns the result of transforming \a vector according to \a matrix, Returns the result of transforming \a vector according to \a matrix,
with the matrix applied post-vector. The vector is transformed as a point. with the matrix applied post-vector. The vector is transformed as a point.
@ -643,7 +643,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor)
\fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) \fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
\relates QMatrix4x4 \relates QMatrix4x4
\obsolete Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead. \deprecated Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead.
Returns the result of transforming \a vector according to \a matrix, Returns the result of transforming \a vector according to \a matrix,
with the matrix applied pre-vector. The vector is transformed as a with the matrix applied pre-vector. The vector is transformed as a
@ -696,7 +696,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor)
\fn QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) \fn QPoint operator*(const QMatrix4x4& matrix, const QPoint& point)
\relates QMatrix4x4 \relates QMatrix4x4
\obsolete Use QMatrix4x4::map() instead. \deprecated Use QMatrix4x4::map() instead.
Returns the result of transforming \a point according to \a matrix, Returns the result of transforming \a point according to \a matrix,
with the matrix applied pre-point. with the matrix applied pre-point.
@ -706,7 +706,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor)
\fn QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) \fn QPointF operator*(const QMatrix4x4& matrix, const QPointF& point)
\relates QMatrix4x4 \relates QMatrix4x4
\obsolete Use QMatrix4x4::map() instead. \deprecated Use QMatrix4x4::map() instead.
Returns the result of transforming \a point according to \a matrix, Returns the result of transforming \a point according to \a matrix,
with the matrix applied pre-point. with the matrix applied pre-point.

8
src/gui/text/qfont.cpp
View File

@ -692,7 +692,7 @@ QFont::QFont()
} }
/*! /*!
\obsolete \deprecated
Constructs a font object with the specified \a family, \a Constructs a font object with the specified \a family, \a
pointSize, \a weight and \a italic settings. pointSize, \a weight and \a italic settings.
@ -1183,7 +1183,7 @@ QFont::Weight QFont::weight() const
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! /*!
\obsolete Use setWeight() instead. \deprecated Use setWeight() instead.
Sets the weight of the font to \a legacyWeight using the legacy font Sets the weight of the font to \a legacyWeight using the legacy font
weight scale of Qt 5 and previous versions. weight scale of Qt 5 and previous versions.
@ -1203,7 +1203,7 @@ void QFont::setLegacyWeight(int legacyWeight)
} }
/*! /*!
\obsolete Use weight() instead. \deprecated Use weight() instead.
Returns the weight of the font converted to the non-standard font Returns the weight of the font converted to the non-standard font
weight scale used in Qt 5 and earlier versions. weight scale used in Qt 5 and earlier versions.
@ -2698,7 +2698,7 @@ QFont::Style QFontInfo::style() const
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
/*! /*!
\obsolete Use weight() instead. \deprecated Use weight() instead.
Returns the weight of the font converted to the non-standard font Returns the weight of the font converted to the non-standard font
weight scale used in Qt 5 and earlier versions. weight scale used in Qt 5 and earlier versions.

2
src/gui/text/qfontdatabase.cpp
View File

@ -1239,7 +1239,7 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
/*! /*!
\fn QFontDatabase::QFontDatabase() \fn QFontDatabase::QFontDatabase()
\obsolete Call the class methods as static functions instead. \deprecated Call the class methods as static functions instead.
Creates a font database object. Creates a font database object.
*/ */

4
src/gui/text/qtextformat.cpp
View File

@ -1457,7 +1457,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt)
/*! /*!
\fn void QTextCharFormat::setFontFamily(const QString &family) \fn void QTextCharFormat::setFontFamily(const QString &family)
\obsolete Use setFontFamilies() instead. \deprecated Use setFontFamilies() instead.
Sets the text format's font \a family. Sets the text format's font \a family.
@ -1467,7 +1467,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt)
/*! /*!
\fn QString QTextCharFormat::fontFamily() const \fn QString QTextCharFormat::fontFamily() const
\obsolete Use fontFamilies() instead. \deprecated Use fontFamilies() instead.
Returns the text format's font family. Returns the text format's font family.

4
src/network/access/qnetworkaccessmanager.cpp
View File

@ -255,7 +255,7 @@ static void ensureInitialized()
\fn void QNetworkAccessManager::networkSessionConnected() \fn void QNetworkAccessManager::networkSessionConnected()
\since 4.7 \since 4.7
\obsolete \deprecated
\internal \internal
@ -1300,7 +1300,7 @@ QStringList QNetworkAccessManager::supportedSchemes() const
/*! /*!
\since 5.2 \since 5.2
\obsolete \deprecated
Lists all the URL schemes supported by the access manager. Lists all the URL schemes supported by the access manager.

6
src/sql/kernel/qsqlfield.cpp
View File

@ -156,7 +156,7 @@ public:
/*! /*!
\fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type, const QString &table) \fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type, const QString &table)
\obsolete Use the constructor using a QMetaType instead \deprecated Use the constructor using a QMetaType instead.
\overload \overload
Constructs an empty field called \a fieldName of variant type \a Constructs an empty field called \a fieldName of variant type \a
@ -419,7 +419,7 @@ void QSqlField::setMetaType(QMetaType type)
/*! /*!
\fn QVariant::Type QSqlField::type() const \fn QVariant::Type QSqlField::type() const
\obsolete Use metaType() instead. \deprecated Use metaType() instead.
Returns the field's type as stored in the database. Returns the field's type as stored in the database.
Note that the actual value might have a different type, Note that the actual value might have a different type,
@ -432,7 +432,7 @@ void QSqlField::setMetaType(QMetaType type)
/*! /*!
\fn void QSqlField::setType(QVariant::Type type) \fn void QSqlField::setType(QVariant::Type type)
\obsolete Use setMetaType() instead. \deprecated Use setMetaType() instead.
Set's the field's variant type to \a type. Set's the field's variant type to \a type.

4
src/sql/kernel/qsqlquery.cpp
View File

@ -251,7 +251,7 @@ QSqlQuery::~QSqlQuery()
/*! /*!
Constructs a copy of \a other. Constructs a copy of \a other.
\obsolete QSqlQuery cannot be meaningfully copied. Prepared \deprecated QSqlQuery cannot be meaningfully copied. Prepared
statements, bound values and so on will not work correctly, depending statements, bound values and so on will not work correctly, depending
on your database driver (for instance, changing the copy will affect on your database driver (for instance, changing the copy will affect
the original). Treat QSqlQuery as a move-only type instead. the original). Treat QSqlQuery as a move-only type instead.
@ -266,7 +266,7 @@ QSqlQuery::QSqlQuery(const QSqlQuery& other)
/*! /*!
Assigns \a other to this object. Assigns \a other to this object.
\obsolete QSqlQuery cannot be meaningfully copied. Prepared \deprecated QSqlQuery cannot be meaningfully copied. Prepared
statements, bound values and so on will not work correctly, depending statements, bound values and so on will not work correctly, depending
on your database driver (for instance, changing the copy will affect on your database driver (for instance, changing the copy will affect
the original). Treat QSqlQuery as a move-only type instead. the original). Treat QSqlQuery as a move-only type instead.

2
src/sql/models/qsqlquerymodel.cpp
View File

@ -420,7 +420,7 @@ void QSqlQueryModel::queryChange()
/*! /*!
\obsolete \deprecated
\overload \overload
\since 4.5 \since 4.5

26
src/widgets/dialogs/qmessagebox.cpp
View File

@ -2051,7 +2051,7 @@ void QMessageBoxPrivate::retranslateStrings()
#if QT_DEPRECATED_SINCE(6,2) #if QT_DEPRECATED_SINCE(6,2)
/*! /*!
\obsolete \deprecated
Constructs a message box with a \a title, a \a text, an \a icon, Constructs a message box with a \a title, a \a text, an \a icon,
and up to three buttons. and up to three buttons.
@ -2115,7 +2115,7 @@ QMessageBox::QMessageBox(const QString &title, const QString &text, Icon icon,
} }
/*! /*!
\obsolete \deprecated
Opens an information message box with the given \a title and the Opens an information message box with the given \a title and the
\a text. The dialog may have up to three buttons. Each of the \a text. The dialog may have up to three buttons. Each of the
@ -2161,7 +2161,7 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin
} }
/*! /*!
\obsolete \deprecated
\overload \overload
Displays an information message box with the given \a title and Displays an information message box with the given \a title and
@ -2201,7 +2201,7 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin
} }
/*! /*!
\obsolete \deprecated
Opens a question message box with the given \a title and \a text. Opens a question message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the buttons, \a The dialog may have up to three buttons. Each of the buttons, \a
@ -2247,7 +2247,7 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString&
} }
/*! /*!
\obsolete \deprecated
\overload \overload
Displays a question message box with the given \a title and \a Displays a question message box with the given \a title and \a
@ -2287,7 +2287,7 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString&
/*! /*!
\obsolete \deprecated
Opens a warning message box with the given \a title and \a text. Opens a warning message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the button The dialog may have up to three buttons. Each of the button
@ -2333,7 +2333,7 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t
} }
/*! /*!
\obsolete \deprecated
\overload \overload
Displays a warning message box with the given \a title and \a Displays a warning message box with the given \a title and \a
@ -2372,7 +2372,7 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t
} }
/*! /*!
\obsolete \deprecated
Opens a critical message box with the given \a title and \a text. Opens a critical message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the button The dialog may have up to three buttons. Each of the button
@ -2419,7 +2419,7 @@ int QMessageBox::critical(QWidget *parent, const QString &title, const QString&
} }
/*! /*!
\obsolete \deprecated
\overload \overload
Displays a critical error message box with the given \a title and Displays a critical error message box with the given \a title and
@ -2459,7 +2459,7 @@ int QMessageBox::critical(QWidget *parent, const QString &title, const QString&
/*! /*!
\obsolete \deprecated
Returns the text of the message box button \a button, or Returns the text of the message box button \a button, or
an empty string if the message box does not contain the button. an empty string if the message box does not contain the button.
@ -2480,7 +2480,7 @@ QString QMessageBox::buttonText(int button) const
} }
/*! /*!
\obsolete \deprecated
Sets the text of the message box button \a button to \a text. Sets the text of the message box button \a button to \a text.
Setting the text of a button that is not in the message box is Setting the text of a button that is not in the message box is
@ -2729,7 +2729,7 @@ void QMessageBoxPrivate::helperDone(QDialog::DialogCode code, QPlatformDialogHel
#if QT_DEPRECATED_SINCE(6,2) #if QT_DEPRECATED_SINCE(6,2)
/*! /*!
\obsolete \deprecated
Returns the pixmap used for a standard icon. This allows the Returns the pixmap used for a standard icon. This allows the
pixmaps to be used in more complex message boxes. \a icon pixmaps to be used in more complex message boxes. \a icon
@ -2749,7 +2749,7 @@ QPixmap QMessageBox::standardIcon(Icon icon)
/*! /*!
\typedef QMessageBox::Button \typedef QMessageBox::Button
\obsolete \deprecated
Use QMessageBox::StandardButton instead. Use QMessageBox::StandardButton instead.
*/ */

4
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -3265,7 +3265,7 @@ void QGraphicsItem::setFiltersChildEvents(bool enabled)
} }
/*! /*!
\obsolete \deprecated
Returns \c true if this item handles child events (i.e., all events Returns \c true if this item handles child events (i.e., all events
intended for any of its children are instead sent to this item); intended for any of its children are instead sent to this item);
@ -3287,7 +3287,7 @@ bool QGraphicsItem::handlesChildEvents() const
} }
/*! /*!
\obsolete \deprecated
If \a enabled is true, this item is set to handle all events for If \a enabled is true, this item is set to handle all events for
all its children (i.e., all events intented for any of its all its children (i.e., all events intented for any of its

2
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -5260,7 +5260,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
} }
/*! /*!
\obsolete \deprecated
Paints the given \a items using the provided \a painter, after the Paints the given \a items using the provided \a painter, after the
background has been drawn, and before the foreground has been background has been drawn, and before the foreground has been

2
src/widgets/graphicsview/qgraphicsview.cpp
View File

@ -3741,7 +3741,7 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect)
} }
/*! /*!
\obsolete \deprecated
Draws the items \a items in the scene using \a painter, after the Draws the items \a items in the scene using \a painter, after the
background and before the foreground are drawn. \a numItems is the number background and before the foreground are drawn. \a numItems is the number

2
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -1008,7 +1008,7 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegateForColumn(int column) cons
/*! /*!
\fn QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) const \fn QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) const
\obsolete Use itemDelegateForIndex() instead. \deprecated Use itemDelegateForIndex() instead.
Returns the item delegate used by this view and model for Returns the item delegate used by this view and model for
the given \a index. the given \a index.
*/ */

2
src/widgets/kernel/qapplication.cpp
View File

@ -1563,7 +1563,7 @@ QWidget *QApplication::activeWindow()
#if QT_DEPRECATED_SINCE(6,0) #if QT_DEPRECATED_SINCE(6,0)
/*! /*!
\obsolete Use the QFontMetricsF constructor instead \deprecated Use the QFontMetricsF constructor instead.
Returns display (screen) font metrics for the application font. Returns display (screen) font metrics for the application font.
\sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics() \sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics()

8
src/widgets/kernel/qwidget.cpp
View File

@ -4182,7 +4182,7 @@ QWidget *QWidget::nativeParentWidget() const
} }
/*! \fn QWidget *QWidget::topLevelWidget() const /*! \fn QWidget *QWidget::topLevelWidget() const
\obsolete \deprecated
Use window() instead. Use window() instead.
*/ */
@ -5921,7 +5921,7 @@ void QWidgetPrivate::setWindowIconText_sys(const QString &iconText)
new \a iconText as an argument. new \a iconText as an argument.
\since 5.2 \since 5.2
\obsolete \deprecated
This signal is deprecated. This signal is deprecated.
*/ */
@ -6053,7 +6053,7 @@ void QWidgetPrivate::setWindowIcon_sys()
It is only implemented on the X11 platform, and only certain It is only implemented on the X11 platform, and only certain
window managers use this window property. window managers use this window property.
\obsolete \deprecated
This property is deprecated. This property is deprecated.
\sa windowIcon, windowTitle \sa windowIcon, windowTitle
@ -11648,7 +11648,7 @@ void QWidgetPrivate::stackUnder_sys(QWidget*)
/*! /*!
\fn bool QWidget::isTopLevel() const \fn bool QWidget::isTopLevel() const
\obsolete \deprecated
Use isWindow() instead. Use isWindow() instead.
*/ */

2
src/widgets/styles/qstyle.cpp
View File

@ -2145,7 +2145,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
/*! /*!
\fn QPixmap QStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option, const QWidget *widget) const \fn QPixmap QStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option, const QWidget *widget) const
\obsolete \deprecated
Returns a pixmap for the given \a standardPixmap. Returns a pixmap for the given \a standardPixmap.
A standard pixmap is a pixmap that can follow some existing GUI A standard pixmap is a pixmap that can follow some existing GUI

4
src/widgets/widgets/qlabel.cpp
View File

@ -190,7 +190,7 @@ QLabelPrivate::~QLabelPrivate()
#ifndef QT_NO_PICTURE #ifndef QT_NO_PICTURE
/*! /*!
\fn QPicture QLabel::picture(Qt::ReturnByValueConstant) const \fn QPicture QLabel::picture(Qt::ReturnByValueConstant) const
\obsolete Use the overload without argument instead. \deprecated Use the overload without argument instead.
\since 5.15 \since 5.15
Returns the label's picture. Returns the label's picture.
@ -396,7 +396,7 @@ QPixmap QLabel::pixmap() const
/*! /*!
\fn QPixmap QLabel::pixmap(Qt::ReturnByValueConstant) const \fn QPixmap QLabel::pixmap(Qt::ReturnByValueConstant) const
\obsolete Use the overload without argument instead. \deprecated Use the overload without argument instead.
\since 5.15 \since 5.15
Returns the label's pixmap. Returns the label's pixmap.

2
src/xml/dom/qdom.cpp
View File

@ -6239,7 +6239,7 @@ bool QDomDocument::setContent(const QByteArray& buffer, QString *errorMsg, int *
/*! /*!
\overload \overload
\obsolete \deprecated
This function reads the XML document from the IO device \a dev, returning This function reads the XML document from the IO device \a dev, returning
true if the content was successfully parsed; otherwise returns \c false. true if the content was successfully parsed; otherwise returns \c false.