Fix a number of qdoc warnings related to deprecation

Remove obsolete documentation.

Change-Id: Iaf4b6f9852a883dea0f256c5c89e74f6ebbe85f3
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

7 files changed, 2 insertions, 121 deletions

diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index cbcc4e48f7..5b1016e838 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -2103,7 +2103,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after)
     \overload
 
     Replaces every occurrence of the \a bsize bytes starting at \a before with
-    the \asize bytes starting at \a after. Since the sizes of the strings are
+    the \a size bytes starting at \a after. Since the sizes of the strings are
     given by \a bsize and \a asize, they may contain '\\0' bytes and do not need
     to be '\\0'-terminated.
 */
diff --git a/src/corelib/text/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp
index d04555ed4d..621ee6be7c 100644
--- a/src/corelib/text/qbytearraylist.cpp
+++ b/src/corelib/text/qbytearraylist.cpp
@@ -150,22 +150,6 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char
     return res;
 }
 
-/*!
-    \fn int QByteArrayList::indexOf(const char *needle, int from) const
-
-    Returns the index position of the first occurrence of \a needle in
-    the list, searching forward from index position \a from. Returns
-    -1 if no item matched.
-
-    \a needle must be NUL-terminated.
-
-    This overload doesn't require creating a QByteArray, thus saving a
-    memory allocation and some CPU time.
-
-    \since 5.13
-    \overload
-*/
-
 int QtPrivate::QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from)
 {
     const auto it = std::find_if(that->begin() + from, that->end(), [needle](const QByteArray &item) { return item == needle; });
diff --git a/src/corelib/text/qbytearrayview.qdoc b/src/corelib/text/qbytearrayview.qdoc
index d1a9df6a1c..f386881fa2 100644
--- a/src/corelib/text/qbytearrayview.qdoc
+++ b/src/corelib/text/qbytearrayview.qdoc
@@ -660,7 +660,7 @@
 */
 
 /*!
-    \fn int QByteArrayView::count(QByteArrayView &bv) const
+    \fn qizetype QByteArrayView::count(QByteArrayView bv) const
 
     Returns the number of (potentially overlapping) occurrences of the
     sequence of bytes viewed by \a bv in this byte array view.
diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp
index df9ab17174..52b1a1cbec 100644
--- a/src/corelib/text/qchar.cpp
+++ b/src/corelib/text/qchar.cpp
@@ -1724,38 +1724,6 @@ char32_t QChar::toCaseFolded(char32_t ucs4) noexcept
     \sa toLatin1(), unicode()
 */
 
-/*!
-    \fn char QChar::toAscii() const
-    \deprecated
-
-    Returns the Latin-1 character value of the QChar, or 0 if the character is not
-    representable.
-
-    The main purpose of this function is to preserve ASCII characters used
-    in C strings. This is mainly useful for developers of non-internationalized
-    software.
-
-    \note It is not possible to distinguish a non-Latin 1 character from an ASCII 0
-    (NUL) character. Prefer to use unicode(), which does not have this ambiguity.
-
-    \note This function does not check whether the character value is inside
-    the valid range of US-ASCII.
-
-    \sa toLatin1(), unicode()
-*/
-
-/*!
-    \fn QChar QChar::fromAscii(char)
-    \deprecated
-
-    Converts the ASCII character \a c to it's equivalent QChar. This
-    is mainly useful for non-internationalized software.
-
-    An alternative is to use QLatin1Char.
-
-    \sa fromLatin1(), unicode()
-*/
-
 #ifndef QT_NO_DATASTREAM
 /*!
     \relates QChar
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index b40ca317ea..41d6157bdf 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -4110,7 +4110,6 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci
 }
 
 /*!
-  \fn QString QLocale::toCurrencyString(float i, const QString &symbol) const
   \fn QString QLocale::toCurrencyString(float i, const QString &symbol, int precision) const
   \overload toCurrencyString()
 */
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
index eb497d9386..c9c62d0878 100644
--- a/src/corelib/text/qlocale.qdoc
+++ b/src/corelib/text/qlocale.qdoc
@@ -1267,8 +1267,3 @@
     \since 4.8
     \overload
 */
-/*!
-    \fn QString QLocale::toCurrencyString(float value, const QString &symbol) const
-    \since 4.8
-    \overload
-*/
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index bb98465414..5819771a1a 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -1790,21 +1790,6 @@ inline char qToLower(char ch)
     \sa fromRawData(), QChar, QLatin1String, QByteArray, QStringRef
 */
 
-/*!
-    \enum QString::SplitBehavior
-
-    \obsolete
-    Use Qt::SplitBehavior instead.
-
-    This enum specifies how the split() function should behave with
-    respect to empty strings.
-
-    \value KeepEmptyParts  If a field is empty, keep it in the result.
-    \value SkipEmptyParts  If a field is empty, don't include it in the result.
-
-    \sa split()
-*/
-
 /*! \typedef QString::ConstIterator
 
     Qt-style synonym for QString::const_iterator.
@@ -2476,20 +2461,6 @@ QString &QString::operator=(QChar ch)
     \sa append(), prepend(), replace(), remove()
 */
 
-
-/*!
-    \fn QString& QString::insert(qsizetype position, const QStringRef &str)
-    \since 5.5
-    \overload insert()
-
-    Inserts the string reference \a str at the given index \a position and
-    returns a reference to this string.
-
-    If the given \a position is greater than size(), the array is
-    first extended using resize().
-*/
-
-
 /*!
     \fn QString& QString::insert(qsizetype position, QStringView str)
     \since 6.0
@@ -2753,14 +2724,6 @@ QString &QString::append(QChar ch)
     returns a reference to this string.
 */
 
-/*! \fn QString &QString::prepend(const QStringRef &str)
-    \since 5.5
-    \overload prepend()
-
-    Prepends the string reference \a str to the beginning of this string and
-    returns a reference to this string.
-*/
-
 /*! \fn QString &QString::prepend(QStringView str)
     \since 6.0
     \overload prepend()
@@ -4063,20 +4026,6 @@ qsizetype QString::count(QStringView str, Qt::CaseSensitivity cs) const
     character \a ch; otherwise returns \c false.
 */
 
-#if QT_STRINGVIEW_LEVEL < 2
-/*! \fn bool QString::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
-    \since 4.8
-
-    Returns \c true if this string contains an occurrence of the string
-    reference \a str; otherwise returns \c false.
-
-    If \a cs is Qt::CaseSensitive (default), the search is
-    case sensitive; otherwise the search is case insensitive.
-
-    \sa indexOf(), count()
-*/
-#endif // QT_STRINGVIEW_LEVEL < 2
-
 /*! \fn bool QString::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \since 5.14
     \overload contains()
@@ -5550,13 +5499,6 @@ QString& QString::fill(QChar ch, qsizetype size)
     \sa QT_NO_CAST_FROM_ASCII
 */
 
-/*! \fn QString &QString::operator+=(const QStringRef &str)
-
-    \overload operator+=()
-
-    Appends the string section referenced by \a str to this string.
-*/
-
 /*! \fn QString &QString::operator+=(QStringView str)
     \since 6.0
     \overload operator+=()
@@ -11898,13 +11840,6 @@ float QStringRef::toFloat(bool *ok) const
 }
 
 /*!
-    \obsolete
-    \fn QString Qt::escape(const QString &plain)
-
-    Use QString::toHtmlEscaped() instead.
-*/
-
-/*!
     \since 5.0
 
     Converts a plain text string to an HTML string with