From f3449b4d0a11285ec880c07284437513c701a025 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 30 Apr 2020 21:39:46 +0200 Subject: [PATCH] QString: replace a few autos with char32_t (under protest) Amends 4ba25a092065a6422510a9f4afa4fbbabeda686c. Change-Id: I5d5eecd9196fff34ac008bcb0213f476ccbb1155 Reviewed-by: Thiago Macieira --- src/corelib/text/qstring.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index cffcf6575b..6eb84f6c99 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -597,7 +597,7 @@ bool QtPrivate::isValidUtf16(QStringView s) noexcept QStringIterator i(s); while (i.hasNext()) { - const auto c = i.next(InvalidCodePoint); + const char32_t c = i.next(InvalidCodePoint); if (c == InvalidCodePoint) return false; } @@ -5077,7 +5077,7 @@ bool QString::isUpper() const QStringIterator it(*this); while (it.hasNext()) { - const auto uc = it.nextUnchecked(); + const char32_t uc = it.nextUnchecked(); if (qGetProp(uc)->cases[QUnicodeTables::UpperCase].diff) return false; } @@ -5103,7 +5103,7 @@ bool QString::isLower() const QStringIterator it(*this); while (it.hasNext()) { - const auto uc = it.nextUnchecked(); + const char32_t uc = it.nextUnchecked(); if (qGetProp(uc)->cases[QUnicodeTables::LowerCase].diff) return false; } @@ -6594,7 +6594,7 @@ static QString convertCase(T &str, QUnicodeTables::Case which) QStringIterator it(p, e); while (it.hasNext()) { - const auto uc = it.nextUnchecked(); + const char32_t uc = it.nextUnchecked(); if (qGetProp(uc)->cases[which].diff) { it.recedeUnchecked(); return detachAndConvertCase(str, it, which);