QLatin1String: Add overloads taking QLatin1Char

Without the overloads using QLatin1Char in QL1S member functions results
in the QL1Char being converted to QChar and QL1String being converted to
QString.

Change-Id: Ic19545539a207f025a6293f0b2d929de475dc166
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 48 insertions, 0 deletions

diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index d68721b0df..8f3bde843e 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -9020,6 +9020,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
     \sa operator==(), operator<(), operator>()
 */
 
+/*!
+    \fn int QLatin1String::compare(QLatin1Char ch, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
 
 /*!
     \fn bool QLatin1String::startsWith(QStringView str, Qt::CaseSensitivity cs) const
@@ -9042,6 +9048,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
 */
 
 /*!
+    \fn bool QLatin1String::startsWith(QLatin1Char ch, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
+/*!
     \fn bool QLatin1String::endsWith(QStringView str, Qt::CaseSensitivity cs) const
     \since 5.10
     \fn bool QLatin1String::endsWith(QLatin1String l1, Qt::CaseSensitivity cs) const
@@ -9062,6 +9074,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
 */
 
 /*!
+    \fn bool QLatin1String::endsWith(QLatin1Char ch, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
+/*!
     \fn qsizetype QLatin1String::indexOf(QStringView str, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \fn qsizetype QLatin1String::indexOf(QLatin1String l1, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \fn qsizetype QLatin1String::indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
@@ -9082,6 +9100,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
 */
 
 /*!
+    \fn qsizetype QLatin1String::indexOf(QLatin1Char ch, qsizetype from, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
+/*!
     \fn bool QLatin1String::contains(QStringView str, Qt::CaseSensitivity cs) const
     \fn bool QLatin1String::contains(QLatin1String l1, Qt::CaseSensitivity cs) const
     \fn bool QLatin1String::contains(QChar c, Qt::CaseSensitivity cs) const
@@ -9099,6 +9123,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
 */
 
 /*!
+    \fn bool QLatin1String::contains(QLatin1Char ch, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
+/*!
     \fn qsizetype QLatin1String::lastIndexOf(QStringView str, qsizetype from, Qt::CaseSensitivity cs) const
     \fn qsizetype QLatin1String::lastIndexOf(QLatin1String l1, qsizetype from, Qt::CaseSensitivity cs) const
     \fn qsizetype QLatin1String::lastIndexOf(QChar c, qsizetype from, Qt::CaseSensitivity cs) const
@@ -9120,6 +9150,12 @@ QString &QString::setRawData(const QChar *unicode, qsizetype size)
 */
 
 /*!
+    \fn qsizetype QLatin1String::lastIndexOf(QLatin1Char ch, qsizetype from, Qt::CaseSensitivity cs) const
+    \since 6.3
+    \overload
+*/
+
+/*!
     \fn QLatin1String::const_iterator QLatin1String::begin() const
     \since 5.10
 
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 5e215625c6..e17bcbfbf6 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -117,6 +117,8 @@ public:
     { return isEmpty() || front() == c ? size() - 1 : uchar(m_data[0]) - c.unicode() ; }
     [[nodiscard]] int compare(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::compareStrings(*this, QStringView(&c, 1), cs); }
+    [[nodiscard]] int compare(QLatin1Char c, Qt::CaseSensitivity cs) const noexcept
+    { char ch = c.toLatin1(); return QtPrivate::compareStrings(*this, QLatin1String(&ch, 1), cs); }
 
     [[nodiscard]] bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
@@ -126,6 +128,8 @@ public:
     { return !isEmpty() && front() == c; }
     [[nodiscard]] inline bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::startsWith(*this, QStringView(&c, 1), cs); }
+    [[nodiscard]] inline bool startsWith(QLatin1Char c, Qt::CaseSensitivity cs) const noexcept
+    { char ch = c.toLatin1(); return QtPrivate::startsWith(*this, QLatin1String(&ch, 1), cs); }
 
     [[nodiscard]] bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
@@ -135,6 +139,8 @@ public:
     { return !isEmpty() && back() == c; }
     [[nodiscard]] inline bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::endsWith(*this, QStringView(&c, 1), cs); }
+    [[nodiscard]] inline bool endsWith(QLatin1Char c, Qt::CaseSensitivity cs) const noexcept
+    { char ch = c.toLatin1(); return QtPrivate::endsWith(*this, QLatin1String(&ch, 1), cs); }
 
     [[nodiscard]] qsizetype indexOf(QStringView s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::findString(*this, from, s, cs); }
@@ -142,6 +148,8 @@ public:
     { return QtPrivate::findString(*this, from, s, cs); }
     [[nodiscard]] qsizetype indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::findString(*this, from, QStringView(&c, 1), cs); }
+    [[nodiscard]] qsizetype indexOf(QLatin1Char c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { char ch = c.toLatin1(); return QtPrivate::findString(*this, from, QLatin1String(&ch, 1), cs); }
 
     [[nodiscard]] bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return indexOf(s, 0, cs) != -1; }
@@ -149,6 +157,8 @@ public:
     { return indexOf(s, 0, cs) != -1; }
     [[nodiscard]] inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return indexOf(QStringView(&c, 1), 0, cs) != -1; }
+    [[nodiscard]] inline bool contains(QLatin1Char c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { char ch = c.toLatin1(); return indexOf(QLatin1String(&ch, 1), 0, cs) != -1; }
 
     [[nodiscard]] qsizetype lastIndexOf(QStringView s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::lastIndexOf(*this, from, s, cs); }
@@ -156,6 +166,8 @@ public:
     { return QtPrivate::lastIndexOf(*this, from, s, cs); }
     [[nodiscard]] qsizetype lastIndexOf(QChar c, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::lastIndexOf(*this, from, QStringView(&c, 1), cs); }
+    [[nodiscard]] qsizetype lastIndexOf(QLatin1Char c, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { char ch = c.toLatin1(); return QtPrivate::lastIndexOf(*this, from, QLatin1String(&ch, 1), cs); }
 
     using value_type = const char;
     using reference = value_type&;