summaryrefslogtreecommitdiffstats
path: root/src/corelib/text
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2021-05-25 15:04:48 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-05-26 13:06:56 +0200
commita1dfe27955ab2da27551d19500c2d2a01d46e470 (patch)
treee1ebc6b2f9a255f5b0c3f2df0833f2f6f431fe74 /src/corelib/text
parentae021882330abc5f6fbaadca290e6e5670c89028 (diff)
Doc: Use \deprecated instead of \obsolete
Task-number: QTBUG-93990 Change-Id: I4e512354a49dde6678ca89cabc56bc76ba666bb3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text')
-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
4 files changed, 14 insertions, 14 deletions
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.