From b6251958932be5966258f362dc9bb7c7475d2d0a Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 9 Mar 2022 21:26:01 +0100 Subject: QtCore: Replace remaining uses of QLatin1String with QLatin1StringView Task-number: QTBUG-98434 Change-Id: Ib7c5fc0aaca6ef33b93c7486e99502c555bf20bc Reviewed-by: Edward Welbourne Reviewed-by: Marc Mutz --- src/corelib/text/qanystringview.h | 4 ++-- src/corelib/text/qanystringview.qdoc | 6 +++--- src/corelib/text/qbytearrayview.h | 2 +- src/corelib/text/qchar.cpp | 2 +- src/corelib/text/qlocale.cpp | 34 +++++++++++++++++----------------- src/corelib/text/qlocale_p.h | 12 ++++++------ src/corelib/text/qlocale_tools.cpp | 4 ++-- src/corelib/text/qstringbuilder.cpp | 6 +++--- src/corelib/text/qstringbuilder.h | 12 ++++++------ src/corelib/text/qstringlist.cpp | 8 ++++---- src/corelib/text/qstringlist.h | 8 ++++---- src/corelib/text/qstringtokenizer.cpp | 4 ++-- src/corelib/text/qstringtokenizer.h | 4 ++-- src/corelib/text/qstringview.cpp | 26 +++++++++++++------------- src/corelib/text/qstringview.h | 16 ++++++++-------- src/corelib/text/qutf8stringview.h | 2 +- 16 files changed, 75 insertions(+), 75 deletions(-) (limited to 'src/corelib/text') diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index 6cdc58ddbf..102a5b63ae 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -189,7 +189,7 @@ public: // defined in qstring.h inline QAnyStringView(const QByteArray &str) noexcept; // TODO: Should we have this at all? Remove? inline QAnyStringView(const QString &str) noexcept; - inline constexpr QAnyStringView(QLatin1String str) noexcept; + inline constexpr QAnyStringView(QLatin1StringView str) noexcept; // defined in qstringbuilder.h template @@ -308,7 +308,7 @@ private: { return Q_ASSERT(isUtf16()), QStringView{m_data_utf16, size()}; } [[nodiscard]] constexpr q_no_char8_t::QUtf8StringView asUtf8StringView() const { return Q_ASSERT(isUtf8()), q_no_char8_t::QUtf8StringView{m_data_utf8, size()}; } - [[nodiscard]] inline constexpr QLatin1String asLatin1StringView() const; + [[nodiscard]] inline constexpr QLatin1StringView asLatin1StringView() const; [[nodiscard]] constexpr size_t charSize() const noexcept { return isUtf16() ? 2 : 1; } Q_ALWAYS_INLINE constexpr void verify(qsizetype pos, qsizetype n = 0) const { diff --git a/src/corelib/text/qanystringview.qdoc b/src/corelib/text/qanystringview.qdoc index 743e389a8f..e7c097a0ec 100644 --- a/src/corelib/text/qanystringview.qdoc +++ b/src/corelib/text/qanystringview.qdoc @@ -61,13 +61,13 @@ function to accept a wide variety of string data sources. One function accepting QAnyStringView thus replaces five function overloads (taking QString, \c{(const QChar*, int)}, - QUtf8StringView, QLatin1String (but see above), and QChar), while + QUtf8StringView, QLatin1StringView (but see above), and QChar), while at the same time enabling even more string data sources to be passed to the function, such as \c{u8"Hello World"}, a \c char8_t string literal. Like elsewhere in Qt, QAnyStringView assumes \c char data is encoded - in UTF-8, unless it is presented as a QLatin1String. + in UTF-8, unless it is presented as a QLatin1StringView. QAnyStringViews should be passed by value, not by reference-to-const: \snippet code/src_corelib_text_qanystringview.cpp 0 @@ -97,7 +97,7 @@ \endlist The 8-bit character types are interpreted as UTF-8 data (except when - presented as a QLatin1String) while the 16-bit character types are + presented as a QLatin1StringView) while the 16-bit character types are interpreted as UTF-16 data in host byte order (the same as QString). \section2 Sizes and Sub-Strings diff --git a/src/corelib/text/qbytearrayview.h b/src/corelib/text/qbytearrayview.h index 8d3ff0be67..07fb018737 100644 --- a/src/corelib/text/qbytearrayview.h +++ b/src/corelib/text/qbytearrayview.h @@ -98,7 +98,7 @@ struct IsContainerCompatibleWithQByteArrayView, QByteArrayView>>>>> : std::true_type {}; -// Used by QLatin1String too +// Used by QLatin1StringView too template static constexpr qsizetype lengthHelperPointer(const Char *data) noexcept { diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index f9ada412c0..c851376c1a 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE This class is only useful to construct a QChar with 8-bit character. - \sa QChar, QLatin1String, QString + \sa QChar, QLatin1StringView, QString */ /*! diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 73a41112a3..c1491f0f15 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -217,46 +217,46 @@ QLocale::Territory QLocalePrivate::codeToTerritory(QStringView code) noexcept return QLocale::AnyTerritory; } -QLatin1String QLocalePrivate::languageToCode(QLocale::Language language, - QLocale::LanguageCodeTypes codeTypes) +QLatin1StringView QLocalePrivate::languageToCode(QLocale::Language language, + QLocale::LanguageCodeTypes codeTypes) { if (language == QLocale::AnyLanguage || language > QLocale::LastLanguage) - return QLatin1String(); + return {}; if (language == QLocale::C) return "C"_L1; const LanguageCodeEntry &i = languageCodeList[language]; if (codeTypes.testFlag(QLocale::ISO639Part1) && i.part1.isValid()) - return QLatin1String(i.part1.code, 2); + return QLatin1StringView(i.part1.code, 2); if (codeTypes.testFlag(QLocale::ISO639Part2B) && i.part2B.isValid()) - return QLatin1String(i.part2B.code, 3); + return QLatin1StringView(i.part2B.code, 3); if (codeTypes.testFlag(QLocale::ISO639Part2T) && i.part2T.isValid()) - return QLatin1String(i.part2T.code, 3); + return QLatin1StringView(i.part2T.code, 3); if (codeTypes.testFlag(QLocale::ISO639Part3)) - return QLatin1String(i.part3.code, 3); + return QLatin1StringView(i.part3.code, 3); - return QLatin1String(); + return {}; } -QLatin1String QLocalePrivate::scriptToCode(QLocale::Script script) +QLatin1StringView QLocalePrivate::scriptToCode(QLocale::Script script) { if (script == QLocale::AnyScript || script > QLocale::LastScript) - return QLatin1String(); + return {}; const unsigned char *c = script_code_list + 4 * script; - return QLatin1String(reinterpret_cast(c), 4); + return QLatin1StringView(reinterpret_cast(c), 4); } -QLatin1String QLocalePrivate::territoryToCode(QLocale::Territory territory) +QLatin1StringView QLocalePrivate::territoryToCode(QLocale::Territory territory) { if (territory == QLocale::AnyTerritory || territory > QLocale::LastTerritory) - return QLatin1String(); + return {}; const unsigned char *c = territory_code_list + 3 * territory; - return QLatin1String(reinterpret_cast(c), c[2] == 0 ? 2 : 3); + return QLatin1StringView(reinterpret_cast(c), c[2] == 0 ? 2 : 3); } namespace { @@ -1553,7 +1553,7 @@ QString QLocale::languageToString(Language language) { if (language > QLocale::LastLanguage) return "Unknown"_L1; - return QLatin1String(language_name_list + language_name_index[language]); + return QLatin1StringView(language_name_list + language_name_index[language]); } /*! @@ -1567,7 +1567,7 @@ QString QLocale::territoryToString(QLocale::Territory territory) { if (territory > QLocale::LastTerritory) return "Unknown"_L1; - return QLatin1String(territory_name_list + territory_name_index[territory]); + return QLatin1StringView(territory_name_list + territory_name_index[territory]); } #if QT_DEPRECATED_SINCE(6, 6) @@ -1595,7 +1595,7 @@ QString QLocale::scriptToString(QLocale::Script script) { if (script > QLocale::LastScript) return "Unknown"_L1; - return QLatin1String(script_name_list + script_name_index[script]); + return QLatin1StringView(script_name_list + script_name_index[script]); } #if QT_STRINGVIEW_LEVEL < 2 diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 1d10e0b292..679bd136e9 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -419,22 +419,22 @@ public: [[nodiscard]] QByteArray bcp47Name(char separator = '-') const; - [[nodiscard]] inline QLatin1String + [[nodiscard]] inline QLatin1StringView languageCode(QLocale::LanguageCodeTypes codeTypes = QLocale::AnyLanguageCode) const { return languageToCode(QLocale::Language(m_data->m_language_id), codeTypes); } - [[nodiscard]] inline QLatin1String scriptCode() const + [[nodiscard]] inline QLatin1StringView scriptCode() const { return scriptToCode(QLocale::Script(m_data->m_script_id)); } - [[nodiscard]] inline QLatin1String territoryCode() const + [[nodiscard]] inline QLatin1StringView territoryCode() const { return territoryToCode(QLocale::Territory(m_data->m_territory_id)); } [[nodiscard]] static const QLocalePrivate *get(const QLocale &l) { return l.d; } - [[nodiscard]] static QLatin1String + [[nodiscard]] static QLatin1StringView languageToCode(QLocale::Language language, QLocale::LanguageCodeTypes codeTypes = QLocale::AnyLanguageCode); - [[nodiscard]] static QLatin1String scriptToCode(QLocale::Script script); - [[nodiscard]] static QLatin1String territoryToCode(QLocale::Territory territory); + [[nodiscard]] static QLatin1StringView scriptToCode(QLocale::Script script); + [[nodiscard]] static QLatin1StringView territoryToCode(QLocale::Territory territory); [[nodiscard]] static QLocale::Language codeToLanguage(QStringView code, QLocale::LanguageCodeTypes codeTypes = QLocale::AnyLanguageCode) noexcept; diff --git a/src/corelib/text/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp index 97c91dd3ee..8259878448 100644 --- a/src/corelib/text/qlocale_tools.cpp +++ b/src/corelib/text/qlocale_tools.cpp @@ -629,7 +629,7 @@ QString qdtoa(qreal d, int *decpt, int *sign) if (decpt) *decpt = nonNullDecpt; - return QLatin1String(result, length); + return QLatin1StringView(result, length); } static QLocaleData::DoubleForm resolveFormat(int precision, int decpt, qsizetype length) @@ -706,7 +706,7 @@ static T dtoString(double d, QLocaleData::DoubleForm form, int precision, bool u int length = 0; int decpt = 0; qt_doubleToAscii(d, form, precision, buffer.data(), buffer.length(), negative, length, decpt); - QLatin1String view(buffer.data(), buffer.data() + length); + QLatin1StringView view(buffer.data(), length); const bool succinct = form == QLocaleData::DFSignificantDigits; qsizetype total = (negative ? 1 : 0) + length; if (qIsFinite(d)) { diff --git a/src/corelib/text/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp index dcb3644fb0..4ede4cc876 100644 --- a/src/corelib/text/qstringbuilder.cpp +++ b/src/corelib/text/qstringbuilder.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE \list \li QString, (since 5.10:) QStringView \li QChar, QLatin1Char, (since 5.10:) \c char16_t, - \li QLatin1String, + \li QLatin1StringView, \li (since 5.10:) \c{const char16_t[]} (\c{u"foo"}), \li QByteArray, \c char, \c{const char[]}. \endlist @@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE if there are three or more of them, and performs equally well in other cases. - \sa QLatin1String, QString + \sa QLatin1StringView, QString */ /*! \fn template QStringBuilder::QStringBuilder(const A &a, const B &b) @@ -107,7 +107,7 @@ QT_BEGIN_NAMESPACE takes a QString parameter. This function is usable with arguments of type \c QString, - \c QLatin1String, + \c QLatin1StringView, \c QChar, \c QLatin1Char, and \c char. */ diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index f5219232b1..3087714149 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -63,7 +63,7 @@ protected: { *out++ = QLatin1Char(a); } - static void appendLatin1To(QLatin1String in, QChar *out) noexcept; + static void appendLatin1To(QLatin1StringView in, QChar *out) noexcept; }; template struct QConcatenable {}; @@ -250,18 +250,18 @@ template <> struct QConcatenable : private QAbstractCon { *out++ = c; } }; -template <> struct QConcatenable : private QAbstractConcatenable +template <> struct QConcatenable : private QAbstractConcatenable { - typedef QLatin1String type; + typedef QLatin1StringView type; typedef QString ConvertTo; enum { ExactSize = true }; - static qsizetype size(const QLatin1String a) { return a.size(); } - static inline void appendTo(const QLatin1String a, QChar *&out) + static qsizetype size(const QLatin1StringView a) { return a.size(); } + static inline void appendTo(const QLatin1StringView a, QChar *&out) { appendLatin1To(a, out); out += a.size(); } - static inline void appendTo(const QLatin1String a, char *&out) + static inline void appendTo(const QLatin1StringView a, char *&out) { if (const char *data = a.data()) { memcpy(out, data, a.size()); diff --git a/src/corelib/text/qstringlist.cpp b/src/corelib/text/qstringlist.cpp index 687c83b8ab..315f7c5396 100644 --- a/src/corelib/text/qstringlist.cpp +++ b/src/corelib/text/qstringlist.cpp @@ -353,7 +353,7 @@ bool QtPrivate::QStringList_contains(const QStringList *that, QStringView str, } /*! - \fn bool QStringList::contains(QLatin1String str, Qt::CaseSensitivity cs) const + \fn bool QStringList::contains(QLatin1StringView str, Qt::CaseSensitivity cs) const \overload \since 5.10 @@ -363,7 +363,7 @@ bool QtPrivate::QStringList_contains(const QStringList *that, QStringView str, \sa indexOf(), lastIndexOf(), QString::contains() */ -bool QtPrivate::QStringList_contains(const QStringList *that, QLatin1String str, +bool QtPrivate::QStringList_contains(const QStringList *that, QLatin1StringView str, Qt::CaseSensitivity cs) { return stringList_contains(*that, str, cs); @@ -509,11 +509,11 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, q } /*! - \fn QString QStringList::join(QLatin1String separator) const + \fn QString QStringList::join(QLatin1StringView separator) const \since 5.8 \overload join() */ -QString QtPrivate::QStringList_join(const QStringList &list, QLatin1String sep) +QString QtPrivate::QStringList_join(const QStringList &list, QLatin1StringView sep) { QString result; if (!list.isEmpty()) { diff --git a/src/corelib/text/qstringlist.h b/src/corelib/text/qstringlist.h index 5ec95036be..b9fc5fc6fa 100644 --- a/src/corelib/text/qstringlist.h +++ b/src/corelib/text/qstringlist.h @@ -63,11 +63,11 @@ namespace QtPrivate { qsizetype Q_CORE_EXPORT QStringList_removeDuplicates(QStringList *that); QString Q_CORE_EXPORT QStringList_join(const QStringList *that, QStringView sep); QString Q_CORE_EXPORT QStringList_join(const QStringList *that, const QChar *sep, qsizetype seplen); - Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1String sep); + Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1StringView sep); QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, QStringView str, Qt::CaseSensitivity cs); bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QStringView str, Qt::CaseSensitivity cs); - bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1String str, Qt::CaseSensitivity cs); + bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1StringView str, Qt::CaseSensitivity cs); void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, QStringView before, QStringView after, Qt::CaseSensitivity cs); @@ -109,7 +109,7 @@ public: inline QString join(QStringView sep) const { return QtPrivate::QStringList_join(self(), sep); } - inline QString join(QLatin1String sep) const + inline QString join(QLatin1StringView sep) const { return QtPrivate::QStringList_join(*self(), sep); } inline QString join(QChar sep) const { return QtPrivate::QStringList_join(self(), &sep, 1); } @@ -147,7 +147,7 @@ public: using QListSpecialMethodsBase::indexOf; using QListSpecialMethodsBase::lastIndexOf; - inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + inline bool contains(QLatin1StringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::QStringList_contains(self(), str, cs); } inline bool contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::QStringList_contains(self(), str, cs); } diff --git a/src/corelib/text/qstringtokenizer.cpp b/src/corelib/text/qstringtokenizer.cpp index cad70c6718..5e3512628f 100644 --- a/src/corelib/text/qstringtokenizer.cpp +++ b/src/corelib/text/qstringtokenizer.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE Argument Deduction (CTAD), you may write \c{QStringTokenizer{string, separator}} (without template arguments). If you can't use C++17 CTAD, you must use the - QStringView::split() or QLatin1String::split() member functions + QStringView::split() or QLatin1StringView::split() member functions and store the return value only in \c{auto} variables: \code @@ -149,7 +149,7 @@ QT_BEGIN_NAMESPACE /*! \typealias QStringTokenizer::value_type - Alias for \c{const QStringView} or \c{const QLatin1String}, + Alias for \c{const QStringView} or \c{const QLatin1StringView}, depending on the tokenizer's \c Haystack template argument. */ diff --git a/src/corelib/text/qstringtokenizer.h b/src/corelib/text/qstringtokenizer.h index 0b98f0646f..4fe8714b97 100644 --- a/src/corelib/text/qstringtokenizer.h +++ b/src/corelib/text/qstringtokenizer.h @@ -168,7 +168,7 @@ namespace Tok { template struct ViewForImpl {}; template <> struct ViewForImpl { using type = QStringView; }; - template <> struct ViewForImpl { using type = QLatin1String; }; + template <> struct ViewForImpl { using type = QLatin1StringView; }; template <> struct ViewForImpl { using type = QChar; }; template <> struct ViewForImpl : ViewForImpl {}; template <> struct ViewForImpl : ViewForImpl {}; @@ -185,7 +185,7 @@ namespace Tok { #endif // This metafunction maps a StringLike to a View (currently, QChar, - // QStringView, QLatin1String). This is what QStringTokenizerBase + // QStringView, QLatin1StringView). This is what QStringTokenizerBase // operates on. QStringTokenizer adds pinning to keep rvalues alive // for the duration of the algorithm. template diff --git a/src/corelib/text/qstringview.cpp b/src/corelib/text/qstringview.cpp index ef33ebf43e..83fb6b8b4f 100644 --- a/src/corelib/text/qstringview.cpp +++ b/src/corelib/text/qstringview.cpp @@ -87,11 +87,11 @@ QT_BEGIN_NAMESPACE QChar constructor by itself. \li \e QString: if you store an unmodified copy of the string and thus would like to take advantage of QString's implicit sharing. - \li QLatin1String: if you can implement the function without converting the - QLatin1String to UTF-16 first; users expect a function overloaded on - QLatin1String to perform strictly less memory allocations than the + \li QLatin1StringView: if you can implement the function without converting the + QLatin1StringView to UTF-16 first; users expect a function overloaded on + QLatin1StringView to perform strictly less memory allocations than the semantically equivalent call of the QStringView version, involving - construction of a QString from the QLatin1String. + construction of a QString from the QLatin1StringView. \endlist QStringView can also be used as the return value of a function. If you call a @@ -564,7 +564,7 @@ QT_BEGIN_NAMESPACE second of the \a args the \c{%N} with the next-lowest \c{N} etc. \c Args can consist of anything that implicitly converts to QString, - QStringView or QLatin1String. + QStringView or QLatin1StringView. In addition, the following types are also supported: QChar, QLatin1Char. @@ -779,7 +779,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn int QStringView::compare(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn int QStringView::compare(QLatin1StringView l1, Qt::CaseSensitivity cs) const \fn int QStringView::compare(QChar ch) const \fn int QStringView::compare(QChar ch, Qt::CaseSensitivity cs) const \since 5.15 @@ -823,7 +823,7 @@ QT_BEGIN_NAMESPACE /*! \fn bool QStringView::startsWith(QStringView str, Qt::CaseSensitivity cs) const - \fn bool QStringView::startsWith(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn bool QStringView::startsWith(QLatin1StringView l1, Qt::CaseSensitivity cs) const \fn bool QStringView::startsWith(QChar ch) const \fn bool QStringView::startsWith(QChar ch, Qt::CaseSensitivity cs) const @@ -839,7 +839,7 @@ QT_BEGIN_NAMESPACE /*! \fn bool QStringView::endsWith(QStringView str, Qt::CaseSensitivity cs) const - \fn bool QStringView::endsWith(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn bool QStringView::endsWith(QLatin1StringView l1, Qt::CaseSensitivity cs) const \fn bool QStringView::endsWith(QChar ch) const \fn bool QStringView::endsWith(QChar ch, Qt::CaseSensitivity cs) const @@ -855,7 +855,7 @@ QT_BEGIN_NAMESPACE /*! \fn qsizetype QStringView::indexOf(QStringView str, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const - \fn qsizetype QStringView::indexOf(QLatin1String l1, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn qsizetype QStringView::indexOf(QLatin1StringView l1, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \fn qsizetype QStringView::indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 5.14 @@ -874,7 +874,7 @@ QT_BEGIN_NAMESPACE /*! \fn bool QStringView::contains(QStringView str, Qt::CaseSensitivity cs) const - \fn bool QStringView::contains(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn bool QStringView::contains(QLatin1StringView l1, Qt::CaseSensitivity cs) const \fn bool QStringView::contains(QChar c, Qt::CaseSensitivity cs) const \since 5.14 @@ -889,7 +889,7 @@ QT_BEGIN_NAMESPACE /*! \fn qsizetype QStringView::lastIndexOf(QStringView str, qsizetype from, Qt::CaseSensitivity cs) const - \fn qsizetype QStringView::lastIndexOf(QLatin1String l1, qsizetype from, Qt::CaseSensitivity cs) const + \fn qsizetype QStringView::lastIndexOf(QLatin1StringView l1, qsizetype from, Qt::CaseSensitivity cs) const \fn qsizetype QStringView::lastIndexOf(QChar c, qsizetype from, Qt::CaseSensitivity cs) const \since 5.14 @@ -915,7 +915,7 @@ QT_BEGIN_NAMESPACE /*! \fn qsizetype QStringView::lastIndexOf(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const - \fn qsizetype QStringView::lastIndexOf(QLatin1String l1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn qsizetype QStringView::lastIndexOf(QLatin1StringView l1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 6.2 \overload lastIndexOf() @@ -1168,7 +1168,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn qsizetype QStringView::count(QLatin1String l1, Qt::CaseSensitivity cs) const noexcept + \fn qsizetype QStringView::count(QLatin1StringView l1, Qt::CaseSensitivity cs) const noexcept \since 6.4 \overload count() diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index 6ca19e927f..194a8280c9 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -303,7 +303,7 @@ public: [[nodiscard]] int compare(QStringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::compareStrings(*this, other, cs); } - [[nodiscard]] inline int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline int compare(QLatin1StringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; [[nodiscard]] constexpr int compare(QChar c) const noexcept { return size() >= 1 ? compare_single_char_helper(*utf16() - c.unicode()) : -1; } [[nodiscard]] int compare(QChar c, Qt::CaseSensitivity cs) const noexcept @@ -313,7 +313,7 @@ public: [[nodiscard]] bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } - [[nodiscard]] inline bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline bool startsWith(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; [[nodiscard]] bool startsWith(QChar c) const noexcept { return !empty() && front() == c; } [[nodiscard]] bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept @@ -321,7 +321,7 @@ public: [[nodiscard]] bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } - [[nodiscard]] inline bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline bool endsWith(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; [[nodiscard]] bool endsWith(QChar c) const noexcept { return !empty() && back() == c; } [[nodiscard]] bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept @@ -331,19 +331,19 @@ public: { return QtPrivate::findString(*this, from, QStringView(&c, 1), cs); } [[nodiscard]] qsizetype indexOf(QStringView s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::findString(*this, from, s, cs); } - [[nodiscard]] inline qsizetype indexOf(QLatin1String s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline qsizetype indexOf(QLatin1StringView s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; [[nodiscard]] bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return indexOf(QStringView(&c, 1), 0, cs) != qsizetype(-1); } [[nodiscard]] bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return indexOf(s, 0, cs) != qsizetype(-1); } - [[nodiscard]] inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline bool contains(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; [[nodiscard]] qsizetype count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::count(*this, c, cs); } [[nodiscard]] qsizetype count(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::count(*this, s, cs); } - [[nodiscard]] inline qsizetype count(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + [[nodiscard]] inline qsizetype count(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; [[nodiscard]] qsizetype lastIndexOf(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return lastIndexOf(c, -1, cs); } @@ -353,8 +353,8 @@ public: { return lastIndexOf(s, size(), cs); } [[nodiscard]] qsizetype lastIndexOf(QStringView s, qsizetype from, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::lastIndexOf(*this, from, s, cs); } - [[nodiscard]] inline qsizetype lastIndexOf(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; - [[nodiscard]] inline qsizetype lastIndexOf(QLatin1String s, qsizetype from, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline qsizetype lastIndexOf(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + [[nodiscard]] inline qsizetype lastIndexOf(QLatin1StringView s, qsizetype from, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; #if QT_CONFIG(regularexpression) [[nodiscard]] qsizetype indexOf(const QRegularExpression &re, qsizetype from = 0, QRegularExpressionMatch *rmatch = nullptr) const diff --git a/src/corelib/text/qutf8stringview.h b/src/corelib/text/qutf8stringview.h index 76fd86b668..2b51d45da8 100644 --- a/src/corelib/text/qutf8stringview.h +++ b/src/corelib/text/qutf8stringview.h @@ -96,7 +96,7 @@ struct IsContainerCompatibleWithQUtf8StringView, QByteArray>>, // This has a compatible value_type, but explicitly a different encoding - std::negation, QLatin1String>>, + std::negation, QLatin1StringView>>, // Don't make an accidental copy constructor std::negation