diff --git a/src/corelib/text/qstringtokenizer.h b/src/corelib/text/qstringtokenizer.h index 532724306ee..3925054580d 100644 --- a/src/corelib/text/qstringtokenizer.h +++ b/src/corelib/text/qstringtokenizer.h @@ -113,9 +113,9 @@ QT_END_INCLUDE_NAMESPACE namespace QtPrivate { namespace Tok { - constexpr qsizetype size(QChar) noexcept { return 1; } + constexpr qsizetype tokenSize(QChar) noexcept { return 1; } template - constexpr qsizetype size(const String &s) noexcept { return static_cast(s.size()); } + constexpr qsizetype tokenSize(const String &s) noexcept { return static_cast(s.size()); } template struct ViewForImpl {}; template <> struct ViewForImpl { using type = QStringView; }; @@ -386,7 +386,7 @@ auto QStringTokenizerBase::next(tokenizer_state state) const n if (state.end >= 0) { // token separator found => return intermediate element: result = m_haystack.sliced(state.start, state.end - state.start); - const auto ns = QtPrivate::Tok::size(m_needle); + const auto ns = QtPrivate::Tok::tokenSize(m_needle); state.start = state.end + ns; state.extra = (ns == 0 ? 1 : 0); } else {