diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2024-05-21 17:34:46 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2024-05-23 01:36:55 +0200 |
| commit | 23dfacb17d0925d376ea548613ee04c75a4503cc (patch) | |
| tree | 0d7f435345c662a6c7453d66adf0fada5b71bfc9 /src | |
| parent | 3f3be9d7745dc6a6b16efdd940ccd12f6622c467 (diff) | |
QString: replace homebrew toString() with the Real Deal™
QLatin1StringView has had a toString() since Qt 6.0. Remove the
wrapper.
Pick-to: 6.7 6.5
Task-number: QTBUG-124365
Change-Id: I91e1cc9a2be2d01f309d681b5abcaf417fa584da
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index d0c39e00375..4d9e60c9950 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -9241,9 +9241,6 @@ static qsizetype resolveStringRefsAndReturnTotalSize(ParseResult &parts, const A } // unnamed namespace -Q_ALWAYS_INLINE QString to_string(QLatin1StringView s) noexcept { return s; } -Q_ALWAYS_INLINE QString to_string(QStringView s) noexcept { return s.toString(); } - template <typename StringView> static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPrivate::ArgBase **args) { @@ -9257,7 +9254,7 @@ static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPriv argIndexToPlaceholderMap.resize(qsizetype(numArgs)); else if (Q_UNLIKELY(static_cast<size_t>(argIndexToPlaceholderMap.size()) < numArgs)) // 3b qWarning("QString::arg: %d argument(s) missing in %ls", - int(numArgs - argIndexToPlaceholderMap.size()), qUtf16Printable(to_string(pattern))); + int(numArgs - argIndexToPlaceholderMap.size()), qUtf16Printable(pattern.toString())); // 5 const qsizetype totalSize = resolveStringRefsAndReturnTotalSize(parts, argIndexToPlaceholderMap, args); |