diff options
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 03e6eb0593a..7d2d675f2ba 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -9209,7 +9209,7 @@ typedef QVarLengthArray<Part, ExpectedParts> ParseResult; typedef QVarLengthArray<int, ExpectedParts/2> ArgIndexToPlaceholderMap; template <typename StringView> -static ParseResult parseMultiArgFormatString(StringView s) +static ParseResult parseMultiArgFormatString_impl(StringView s) { ParseResult result; @@ -9240,6 +9240,11 @@ static ParseResult parseMultiArgFormatString(StringView s) return result; } +static ParseResult parseMultiArgFormatString(QAnyStringView s) +{ + return s.visit([] (auto s) { return parseMultiArgFormatString_impl(s); }); +} + static ArgIndexToPlaceholderMap makeArgIndexToPlaceholderMap(const ParseResult &parts) { ArgIndexToPlaceholderMap result; @@ -9285,8 +9290,7 @@ static qsizetype resolveStringRefsAndReturnTotalSize(ParseResult &parts, const A } // unnamed namespace -template <typename StringView> -static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPrivate::ArgBase **args) +QString QtPrivate::argToQString(QAnyStringView pattern, size_t numArgs, const ArgBase **args) { // Step 1-2 above ParseResult parts = parseMultiArgFormatString(pattern); @@ -9338,13 +9342,6 @@ static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPriv return result; } -QString QtPrivate::argToQString(QAnyStringView pattern, size_t n, const ArgBase **args) -{ - return pattern.visit([n, args](auto pattern) { - return argToQStringImpl(pattern, n, args); - }); -} - /*! \fn bool QString::isRightToLeft() const Returns \c true if the string is read right to left. |