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

Clean up inline keyword use in qstring.h

Browse Source 
If an inline member function is defined outside of its class' body,
its declaration must have the inline keyword. Otherwise, in certain
situations, MinGW complains like this:

   qstring.h:1118:13: error: 'void QString::clear()' redeclared without dllimport attribute after being referenced with dll linkage [-Werror]

Fix all instances in qstring.h by

- adding the inline keyword where it was missing on the definition
  (except constexpr functions, which are implicitly inline)

- removing the inline keyword from all out-of-class-body definitions

While the latter isn't necessary for fixing the MinGW
warning-turned-error, the churn is warranted: It's enlisting all
platforms' help in checking for inline consistency (by causing
"multiple-definition errors" at link time or "inline function never
defined" at compile time when we get it wrong). If we kept the inline
keyword on the definitions, only MinGW would continue to warn, and only
in some, as of yet not fully understood, situations, so we'd have no
control over when these warnings pop up in user code.

Change-Id: I0ae78f1d8f1fa4eaec0b162ea16013669370eead
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 1c1d7ab486b87489163c56b05d10ff907e1d821d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-08-23 16:05:42 +02:00 committed by Qt Cherry-pick Bot
parent 35ee5b4eb7
commit 4daef13af8
1 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
src/corelib/text/qstring.h
View File

@ -159,7 +159,7 @@ class Q_CORE_EXPORT QString
public: public:
typedef QStringPrivate DataPointer; typedef QStringPrivate DataPointer;
inline constexpr QString() noexcept; constexpr QString() noexcept;
explicit QString(const QChar *unicode, qsizetype size = -1); explicit QString(const QChar *unicode, qsizetype size = -1);
QString(QChar c); QString(QChar c);
QString(qsizetype size, QChar c); QString(qsizetype size, QChar c);
@ -205,11 +205,11 @@ public:
inline void detach(); inline void detach();
inline bool isDetached() const; inline bool isDetached() const;
inline bool isSharedWith(const QString &other) const { return d.isSharedWith(other.d); } inline bool isSharedWith(const QString &other) const { return d.isSharedWith(other.d); }
void clear(); inline void clear();
inline const QChar at(qsizetype i) const; inline const QChar at(qsizetype i) const;
const QChar operator[](qsizetype i) const; inline const QChar operator[](qsizetype i) const;
[[nodiscard]] QChar &operator[](qsizetype i); [[nodiscard]] inline QChar &operator[](qsizetype i);
[[nodiscard]] inline QChar front() const { return at(0); } [[nodiscard]] inline QChar front() const { return at(0); }
[[nodiscard]] inline QChar &front(); [[nodiscard]] inline QChar &front();
@ -220,17 +220,17 @@ public:
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(qulonglong a, int fieldwidth=0, int base=10, [[nodiscard]] QString arg(qulonglong a, int fieldwidth=0, int base=10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(long a, int fieldwidth=0, int base=10, [[nodiscard]] inline QString arg(long a, int fieldwidth=0, int base=10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(ulong a, int fieldwidth=0, int base=10, [[nodiscard]] inline QString arg(ulong a, int fieldwidth=0, int base=10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(int a, int fieldWidth = 0, int base = 10, [[nodiscard]] inline QString arg(int a, int fieldWidth = 0, int base = 10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(uint a, int fieldWidth = 0, int base = 10, [[nodiscard]] inline QString arg(uint a, int fieldWidth = 0, int base = 10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(short a, int fieldWidth = 0, int base = 10, [[nodiscard]] inline QString arg(short a, int fieldWidth = 0, int base = 10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(ushort a, int fieldWidth = 0, int base = 10, [[nodiscard]] inline QString arg(ushort a, int fieldWidth = 0, int base = 10,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
[[nodiscard]] QString arg(double a, int fieldWidth = 0, char format = 'g', int precision = -1, [[nodiscard]] QString arg(double a, int fieldWidth = 0, char format = 'g', int precision = -1,
QChar fillChar = u' ') const; QChar fillChar = u' ') const;
@ -325,7 +325,7 @@ public:
}; };
Q_DECLARE_FLAGS(SectionFlags, SectionFlag) Q_DECLARE_FLAGS(SectionFlags, SectionFlag)
[[nodiscard]] QString section(QChar sep, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const; [[nodiscard]] inline QString section(QChar sep, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const;
[[nodiscard]] QString section(const QString &in_sep, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const; [[nodiscard]] QString section(const QString &in_sep, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const;
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
[[nodiscard]] QString section(const QRegularExpression &re, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const; [[nodiscard]] QString section(const QRegularExpression &re, qsizetype start, qsizetype end = -1, SectionFlags flags = SectionDefault) const;
@ -647,11 +647,11 @@ public:
{ return -s2.compare(s1, cs); } { return -s2.compare(s1, cs); }
int localeAwareCompare(const QString& s) const; int localeAwareCompare(const QString& s) const;
int localeAwareCompare(QStringView s) const; inline int localeAwareCompare(QStringView s) const;
static int localeAwareCompare(const QString& s1, const QString& s2) static int localeAwareCompare(const QString& s1, const QString& s2)
{ return s1.localeAwareCompare(s2); } { return s1.localeAwareCompare(s2); }
static int localeAwareCompare(QStringView s1, QStringView s2); static inline int localeAwareCompare(QStringView s1, QStringView s2);
short toShort(bool *ok=nullptr, int base=10) const short toShort(bool *ok=nullptr, int base=10) const
{ return toIntegral_helper<short>(*this, ok, base); } { return toIntegral_helper<short>(*this, ok, base); }
@ -672,15 +672,15 @@ public:
float toFloat(bool *ok=nullptr) const; float toFloat(bool *ok=nullptr) const;
double toDouble(bool *ok=nullptr) const; double toDouble(bool *ok=nullptr) const;
QString &setNum(short, int base=10); inline QString &setNum(short, int base=10);
QString &setNum(ushort, int base=10); inline QString &setNum(ushort, int base=10);
QString &setNum(int, int base=10); inline QString &setNum(int, int base=10);
QString &setNum(uint, int base=10); inline QString &setNum(uint, int base=10);
QString &setNum(long, int base=10); inline QString &setNum(long, int base=10);
QString &setNum(ulong, int base=10); inline QString &setNum(ulong, int base=10);
QString &setNum(qlonglong, int base=10); QString &setNum(qlonglong, int base=10);
QString &setNum(qulonglong, int base=10); QString &setNum(qulonglong, int base=10);
QString &setNum(float, char format='g', int precision=6); inline QString &setNum(float, char format='g', int precision=6);
QString &setNum(double, char format='g', int precision=6); QString &setNum(double, char format='g', int precision=6);
static QString number(int, int base=10); static QString number(int, int base=10);
@ -1074,15 +1074,15 @@ QString QAnyStringView::toString() const
// //
// QString inline members // QString inline members
// //
inline QString::QString(QLatin1StringView latin1) QString::QString(QLatin1StringView latin1)
{ *this = QString::fromLatin1(latin1.data(), latin1.size()); } { *this = QString::fromLatin1(latin1.data(), latin1.size()); }
inline const QChar QString::at(qsizetype i) const const QChar QString::at(qsizetype i) const
{ Q_ASSERT(size_t(i) < size_t(size())); return QChar(d.data()[i]); } { Q_ASSERT(size_t(i) < size_t(size())); return QChar(d.data()[i]); }
inline const QChar QString::operator[](qsizetype i) const const QChar QString::operator[](qsizetype i) const
{ Q_ASSERT(size_t(i) < size_t(size())); return QChar(d.data()[i]); } { Q_ASSERT(size_t(i) < size_t(size())); return QChar(d.data()[i]); }
inline const QChar *QString::unicode() const const QChar *QString::unicode() const
{ return data(); } { return data(); }
inline const QChar *QString::data() const const QChar *QString::data() const
{ {
#if QT5_NULL_STRINGS == 1 #if QT5_NULL_STRINGS == 1
return reinterpret_cast<const QChar *>(d.data() ? d.data() : &_empty); return reinterpret_cast<const QChar *>(d.data() ? d.data() : &_empty);
@ -1090,58 +1090,58 @@ inline const QChar *QString::data() const
return reinterpret_cast<const QChar *>(d.data()); return reinterpret_cast<const QChar *>(d.data());
#endif #endif
} }
inline QChar *QString::data() QChar *QString::data()
{ {
detach(); detach();
Q_ASSERT(d.data()); Q_ASSERT(d.data());
return reinterpret_cast<QChar *>(d.data()); return reinterpret_cast<QChar *>(d.data());
} }
inline const QChar *QString::constData() const const QChar *QString::constData() const
{ return data(); } { return data(); }
inline void QString::detach() void QString::detach()
{ if (d->needsDetach()) reallocData(d.size, QArrayData::KeepSize); } { if (d->needsDetach()) reallocData(d.size, QArrayData::KeepSize); }
inline bool QString::isDetached() const bool QString::isDetached() const
{ return !d->isShared(); } { return !d->isShared(); }
inline void QString::clear() void QString::clear()
{ if (!isNull()) *this = QString(); } { if (!isNull()) *this = QString(); }
inline QString::QString(const QString &other) noexcept : d(other.d) QString::QString(const QString &other) noexcept : d(other.d)
{ } { }
inline qsizetype QString::capacity() const { return qsizetype(d->constAllocatedCapacity()); } qsizetype QString::capacity() const { return qsizetype(d->constAllocatedCapacity()); }
inline QString &QString::setNum(short n, int base) QString &QString::setNum(short n, int base)
{ return setNum(qlonglong(n), base); } { return setNum(qlonglong(n), base); }
inline QString &QString::setNum(ushort n, int base) QString &QString::setNum(ushort n, int base)
{ return setNum(qulonglong(n), base); } { return setNum(qulonglong(n), base); }
inline QString &QString::setNum(int n, int base) QString &QString::setNum(int n, int base)
{ return setNum(qlonglong(n), base); } { return setNum(qlonglong(n), base); }
inline QString &QString::setNum(uint n, int base) QString &QString::setNum(uint n, int base)
{ return setNum(qulonglong(n), base); } { return setNum(qulonglong(n), base); }
inline QString &QString::setNum(long n, int base) QString &QString::setNum(long n, int base)
{ return setNum(qlonglong(n), base); } { return setNum(qlonglong(n), base); }
inline QString &QString::setNum(ulong n, int base) QString &QString::setNum(ulong n, int base)
{ return setNum(qulonglong(n), base); } { return setNum(qulonglong(n), base); }
inline QString &QString::setNum(float n, char f, int prec) QString &QString::setNum(float n, char f, int prec)
{ return setNum(double(n),f,prec); } { return setNum(double(n),f,prec); }
inline QString QString::arg(int a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(int a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); } { return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(uint a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(uint a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); } { return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(long a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(long a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); } { return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(ulong a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(ulong a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); } { return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); } { return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); } { return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::section(QChar asep, qsizetype astart, qsizetype aend, SectionFlags aflags) const QString QString::section(QChar asep, qsizetype astart, qsizetype aend, SectionFlags aflags) const
{ return section(QString(asep), astart, aend, aflags); } { return section(QString(asep), astart, aend, aflags); }
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4127) // "conditional expression is constant" QT_WARNING_DISABLE_MSVC(4127) // "conditional expression is constant"
QT_WARNING_DISABLE_INTEL(111) // "statement is unreachable" QT_WARNING_DISABLE_INTEL(111) // "statement is unreachable"
inline qsizetype QString::toWCharArray(wchar_t *array) const qsizetype QString::toWCharArray(wchar_t *array) const
{ {
return qToStringViewIgnoringNull(*this).toWCharArray(array); return qToStringViewIgnoringNull(*this).toWCharArray(array);
} }
@ -1159,16 +1159,16 @@ qsizetype QStringView::toWCharArray(wchar_t *array) const
QT_WARNING_POP QT_WARNING_POP
inline QString QString::fromWCharArray(const wchar_t *string, qsizetype size) QString QString::fromWCharArray(const wchar_t *string, qsizetype size)
{ {
return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16(reinterpret_cast<const char16_t *>(string), size) return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16(reinterpret_cast<const char16_t *>(string), size)
: fromUcs4(reinterpret_cast<const char32_t *>(string), size); : fromUcs4(reinterpret_cast<const char32_t *>(string), size);
} }
inline constexpr QString::QString() noexcept {} constexpr QString::QString() noexcept {}
inline QString::~QString() {} QString::~QString() {}
inline void QString::reserve(qsizetype asize) void QString::reserve(qsizetype asize)
{ {
if (d->needsDetach() || asize >= capacity() - d.freeSpaceAtBegin()) if (d->needsDetach() || asize >= capacity() - d.freeSpaceAtBegin())
reallocData(qMax(asize, size()), QArrayData::KeepSize); reallocData(qMax(asize, size()), QArrayData::KeepSize);
@ -1176,7 +1176,7 @@ inline void QString::reserve(qsizetype asize)
d->setFlag(Data::CapacityReserved); d->setFlag(Data::CapacityReserved);
} }
inline void QString::squeeze() void QString::squeeze()
{ {
if (!d.isMutable()) if (!d.isMutable())
return; return;
@ -1186,104 +1186,104 @@ inline void QString::squeeze()
d->clearFlag(Data::CapacityReserved); d->clearFlag(Data::CapacityReserved);
} }
inline QString &QString::setUtf16(const ushort *autf16, qsizetype asize) QString &QString::setUtf16(const ushort *autf16, qsizetype asize)
{ return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); } { return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); }
inline QChar &QString::operator[](qsizetype i) QChar &QString::operator[](qsizetype i)
{ Q_ASSERT(i >= 0 && i < size()); return data()[i]; } { Q_ASSERT(i >= 0 && i < size()); return data()[i]; }
inline QChar &QString::front() { return operator[](0); } QChar &QString::front() { return operator[](0); }
inline QChar &QString::back() { return operator[](size() - 1); } QChar &QString::back() { return operator[](size() - 1); }
inline QString::iterator QString::begin() QString::iterator QString::begin()
{ detach(); return reinterpret_cast<QChar*>(d.data()); } { detach(); return reinterpret_cast<QChar*>(d.data()); }
inline QString::const_iterator QString::begin() const QString::const_iterator QString::begin() const
{ return reinterpret_cast<const QChar*>(d.data()); } { return reinterpret_cast<const QChar*>(d.data()); }
inline QString::const_iterator QString::cbegin() const QString::const_iterator QString::cbegin() const
{ return reinterpret_cast<const QChar*>(d.data()); } { return reinterpret_cast<const QChar*>(d.data()); }
inline QString::const_iterator QString::constBegin() const QString::const_iterator QString::constBegin() const
{ return reinterpret_cast<const QChar*>(d.data()); } { return reinterpret_cast<const QChar*>(d.data()); }
inline QString::iterator QString::end() QString::iterator QString::end()
{ detach(); return reinterpret_cast<QChar*>(d.data() + d.size); } { detach(); return reinterpret_cast<QChar*>(d.data() + d.size); }
inline QString::const_iterator QString::end() const QString::const_iterator QString::end() const
{ return reinterpret_cast<const QChar*>(d.data() + d.size); } { return reinterpret_cast<const QChar*>(d.data() + d.size); }
inline QString::const_iterator QString::cend() const QString::const_iterator QString::cend() const
{ return reinterpret_cast<const QChar*>(d.data() + d.size); } { return reinterpret_cast<const QChar*>(d.data() + d.size); }
inline QString::const_iterator QString::constEnd() const QString::const_iterator QString::constEnd() const
{ return reinterpret_cast<const QChar*>(d.data() + d.size); } { return reinterpret_cast<const QChar*>(d.data() + d.size); }
inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const
{ return indexOf(s, 0, cs) != -1; } { return indexOf(s, 0, cs) != -1; }
inline bool QString::contains(QLatin1StringView s, Qt::CaseSensitivity cs) const bool QString::contains(QLatin1StringView s, Qt::CaseSensitivity cs) const
{ return indexOf(s, 0, cs) != -1; } { return indexOf(s, 0, cs) != -1; }
inline bool QString::contains(QChar c, Qt::CaseSensitivity cs) const bool QString::contains(QChar c, Qt::CaseSensitivity cs) const
{ return indexOf(c, 0, cs) != -1; } { return indexOf(c, 0, cs) != -1; }
inline bool QString::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept bool QString::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept
{ return indexOf(s, 0, cs) != -1; } { return indexOf(s, 0, cs) != -1; }
#if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
inline bool QString::operator==(const char *s) const bool QString::operator==(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) == 0; } { return QString::compare_helper(constData(), size(), s, -1) == 0; }
inline bool QString::operator!=(const char *s) const bool QString::operator!=(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) != 0; } { return QString::compare_helper(constData(), size(), s, -1) != 0; }
inline bool QString::operator<(const char *s) const bool QString::operator<(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) < 0; } { return QString::compare_helper(constData(), size(), s, -1) < 0; }
inline bool QString::operator>(const char *s) const bool QString::operator>(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) > 0; } { return QString::compare_helper(constData(), size(), s, -1) > 0; }
inline bool QString::operator<=(const char *s) const bool QString::operator<=(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) <= 0; } { return QString::compare_helper(constData(), size(), s, -1) <= 0; }
inline bool QString::operator>=(const char *s) const bool QString::operator>=(const char *s) const
{ return QString::compare_helper(constData(), size(), s, -1) >= 0; } { return QString::compare_helper(constData(), size(), s, -1) >= 0; }
// //
// QLatin1StringView inline members that require QString: // QLatin1StringView inline members that require QString:
// //
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator==(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator==(const char *s) const
{ return QString::fromUtf8(s) == *this; } { return QString::fromUtf8(s) == *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator!=(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator!=(const char *s) const
{ return QString::fromUtf8(s) != *this; } { return QString::fromUtf8(s) != *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator<(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator<(const char *s) const
{ return QString::fromUtf8(s) > *this; } { return QString::fromUtf8(s) > *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator>(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator>(const char *s) const
{ return QString::fromUtf8(s) < *this; } { return QString::fromUtf8(s) < *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator<=(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator<=(const char *s) const
{ return QString::fromUtf8(s) >= *this; } { return QString::fromUtf8(s) >= *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator>=(const char *s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator>=(const char *s) const
{ return QString::fromUtf8(s) <= *this; } { return QString::fromUtf8(s) <= *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator==(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator==(const QByteArray &s) const
{ return QString::fromUtf8(s) == *this; } { return QString::fromUtf8(s) == *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator!=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator!=(const QByteArray &s) const
{ return QString::fromUtf8(s) != *this; } { return QString::fromUtf8(s) != *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator<(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator<(const QByteArray &s) const
{ return QString::fromUtf8(s) > *this; } { return QString::fromUtf8(s) > *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator>(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator>(const QByteArray &s) const
{ return QString::fromUtf8(s) < *this; } { return QString::fromUtf8(s) < *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator<=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator<=(const QByteArray &s) const
{ return QString::fromUtf8(s) >= *this; } { return QString::fromUtf8(s) >= *this; }
QT_ASCII_CAST_WARN inline bool QLatin1StringView::operator>=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QLatin1StringView::operator>=(const QByteArray &s) const
{ return QString::fromUtf8(s) <= *this; } { return QString::fromUtf8(s) <= *this; }
QT_ASCII_CAST_WARN inline bool QString::operator==(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator==(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) == 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) == 0; }
QT_ASCII_CAST_WARN inline bool QString::operator!=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator!=(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) != 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) != 0; }
QT_ASCII_CAST_WARN inline bool QString::operator<(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator<(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) < 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) < 0; }
QT_ASCII_CAST_WARN inline bool QString::operator>(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator>(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) > 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) > 0; }
QT_ASCII_CAST_WARN inline bool QString::operator<=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator<=(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) <= 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) <= 0; }
QT_ASCII_CAST_WARN inline bool QString::operator>=(const QByteArray &s) const QT_ASCII_CAST_WARN bool QString::operator>=(const QByteArray &s) const
{ return QString::compare_helper(constData(), size(), s.constData(), s.size()) >= 0; } { return QString::compare_helper(constData(), size(), s.constData(), s.size()) >= 0; }
inline bool QByteArray::operator==(const QString &s) const bool QByteArray::operator==(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) == 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) == 0; }
inline bool QByteArray::operator!=(const QString &s) const bool QByteArray::operator!=(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) != 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) != 0; }
inline bool QByteArray::operator<(const QString &s) const bool QByteArray::operator<(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) > 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) > 0; }
inline bool QByteArray::operator>(const QString &s) const bool QByteArray::operator>(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) < 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) < 0; }
inline bool QByteArray::operator<=(const QString &s) const bool QByteArray::operator<=(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) >= 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) >= 0; }
inline bool QByteArray::operator>=(const QString &s) const bool QByteArray::operator>=(const QString &s) const
{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) <= 0; } { return QString::compare_helper(s.constData(), s.size(), constData(), size()) <= 0; }
#endif // !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) #endif // !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
@ -1314,13 +1314,13 @@ QT_ASCII_CAST_WARN inline QString operator+(QString &&lhs, const QByteArray &rhs
# endif // QT_NO_CAST_FROM_ASCII # endif // QT_NO_CAST_FROM_ASCII
#endif // QT_USE_QSTRINGBUILDER #endif // QT_USE_QSTRINGBUILDER
inline std::string QString::toStdString() const std::string QString::toStdString() const
{ return toUtf8().toStdString(); } { return toUtf8().toStdString(); }
inline QString QString::fromStdString(const std::string &s) QString QString::fromStdString(const std::string &s)
{ return fromUtf8(s.data(), qsizetype(s.size())); } { return fromUtf8(s.data(), qsizetype(s.size())); }
inline std::wstring QString::toStdWString() const std::wstring QString::toStdWString() const
{ {
std::wstring str; std::wstring str;
str.resize(size()); str.resize(size());
@ -1328,19 +1328,19 @@ inline std::wstring QString::toStdWString() const
return str; return str;
} }
inline QString QString::fromStdWString(const std::wstring &s) QString QString::fromStdWString(const std::wstring &s)
{ return fromWCharArray(s.data(), qsizetype(s.size())); } { return fromWCharArray(s.data(), qsizetype(s.size())); }
inline QString QString::fromStdU16String(const std::u16string &s) QString QString::fromStdU16String(const std::u16string &s)
{ return fromUtf16(s.data(), qsizetype(s.size())); } { return fromUtf16(s.data(), qsizetype(s.size())); }
inline std::u16string QString::toStdU16String() const std::u16string QString::toStdU16String() const
{ return std::u16string(reinterpret_cast<const char16_t*>(data()), size()); } { return std::u16string(reinterpret_cast<const char16_t*>(data()), size()); }
inline QString QString::fromStdU32String(const std::u32string &s) QString QString::fromStdU32String(const std::u32string &s)
{ return fromUcs4(s.data(), qsizetype(s.size())); } { return fromUcs4(s.data(), qsizetype(s.size())); }
inline std::u32string QString::toStdU32String() const std::u32string QString::toStdU32String() const
{ {
std::u32string u32str(size(), char32_t(0)); std::u32string u32str(size(), char32_t(0));
const qsizetype len = toUcs4_helper(reinterpret_cast<const char16_t *>(data()), const qsizetype len = toUcs4_helper(reinterpret_cast<const char16_t *>(data()),
@ -1357,14 +1357,14 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QString &);
Q_DECLARE_SHARED(QString) Q_DECLARE_SHARED(QString)
Q_DECLARE_OPERATORS_FOR_FLAGS(QString::SectionFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(QString::SectionFlags)
inline int QString::compare(QStringView s, Qt::CaseSensitivity cs) const noexcept int QString::compare(QStringView s, Qt::CaseSensitivity cs) const noexcept
{ return -s.compare(*this, cs); } { return -s.compare(*this, cs); }
inline int QString::localeAwareCompare(QStringView s) const int QString::localeAwareCompare(QStringView s) const
{ return localeAwareCompare_helper(constData(), size(), s.constData(), s.size()); } { return localeAwareCompare_helper(constData(), size(), s.constData(), s.size()); }
inline int QString::localeAwareCompare(QStringView s1, QStringView s2) int QString::localeAwareCompare(QStringView s1, QStringView s2)
{ return localeAwareCompare_helper(s1.constData(), s1.size(), s2.constData(), s2.size()); } { return localeAwareCompare_helper(s1.constData(), s1.size(), s2.constData(), s2.size()); }
inline int QStringView::localeAwareCompare(QStringView other) const int QStringView::localeAwareCompare(QStringView other) const
{ return QString::localeAwareCompare(*this, other); } { return QString::localeAwareCompare(*this, other); }
#if QT_CORE_INLINE_IMPL_SINCE(6, 5) #if QT_CORE_INLINE_IMPL_SINCE(6, 5)