From 23dfacb17d0925d376ea548613ee04c75a4503cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 21 May 2024 17:34:46 +0200 Subject: [PATCH] =?UTF-8?q?QString:=20replace=20homebrew=20toString()=20wi?= =?UTF-8?q?th=20the=20Real=20Deal=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mårten Nordheim --- src/corelib/text/qstring.cpp | 5 +---- 1 file changed, 1 insertion(+), 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 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(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);