From dcf856ca7a4b4a645cb321417ddb3b78244bb43b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 25 Jun 2020 15:01:32 +0200 Subject: [PATCH] QStringTokenizer: use sliced() instead of mid() The code was developed against the narrow-contract version of mid(), but not updated when mid() became wide-contract. Change-Id: I038054fb3f5acc0085c48fbf36af13dd14c917b8 Reviewed-by: Lars Knoll --- src/corelib/text/qstringtokenizer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qstringtokenizer.h b/src/corelib/text/qstringtokenizer.h index 333153f5a3..e0aefe2522 100644 --- a/src/corelib/text/qstringtokenizer.h +++ b/src/corelib/text/qstringtokenizer.h @@ -416,13 +416,13 @@ auto QStringTokenizerBase::next(tokenizer_state state) const n Haystack result; if (state.end >= 0) { // token separator found => return intermediate element: - result = m_haystack.mid(state.start, state.end - state.start); + result = m_haystack.sliced(state.start, state.end - state.start); const auto ns = QtPrivate::Tok::size(m_needle); state.start = state.end + ns; state.extra = (ns == 0 ? 1 : 0); } else { // token separator not found => return final element: - result = m_haystack.mid(state.start); + result = m_haystack.sliced(state.start); } if ((m_sb & Qt::SkipEmptyParts) && result.isEmpty()) continue;