From 1aa00c993be4d7e27555bcd5c13f945766090b9c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 Jul 2022 16:16:57 +0200 Subject: Port qt_readEscapedFormatString() to qsizetype More of the usual missing int -> qsizetype porting... Pick-to: 6.4 6.3 6.2 Task-number: QTBUG-103531 Change-Id: I53faff5fe306c1d207741bc93a1e5c15d3eefa4f Reviewed-by: Thiago Macieira --- src/corelib/text/qlocale.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/text/qlocale.cpp') diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index d3670c119a..0bfcba2f97 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -618,9 +618,9 @@ QLocaleId QLocaleId::fromName(QStringView name) return { langId, QLocalePrivate::codeToScript(script), QLocalePrivate::codeToTerritory(land) }; } -QString qt_readEscapedFormatString(QStringView format, int *idx) +QString qt_readEscapedFormatString(QStringView format, qsizetype *idx) { - int &i = *idx; + qsizetype &i = *idx; Q_ASSERT(format.at(i) == u'\''); ++i; @@ -2091,7 +2091,7 @@ QString QLocale::toString(QDate date, FormatType format) const static bool timeFormatContainsAP(QStringView format) { - int i = 0; + qsizetype i = 0; while (i < format.size()) { if (format.at(i).unicode() == '\'') { qt_readEscapedFormatString(format, &i); @@ -3317,7 +3317,7 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime & day = parts.day; } - int i = 0; + qsizetype i = 0; while (i < format.size()) { if (format.at(i).unicode() == '\'') { result.append(qt_readEscapedFormatString(format, &i)); -- cgit v1.2.3