From f8bf0150ff2d4b9117cdcf3c7c966e47f0d5efa1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 11 Aug 2022 15:32:23 +0200 Subject: [PATCH] Finish porting cross-platform parts of QStringConverter to qsizetype/size_t There are still problems with platforms-specific APIs that are 32-bit only (cf. QTBUG-105105), but this patch finishes the port of the cross-platform parts of QStringConverter. None of these changes have a user-visible effect. They just avoid the Code Smell that int has become since Qt 6.0. Task-number: QTBUG-103531 Change-Id: I267e2e1268a18c130892fa2fd80d1b5dabb3d9b9 Reviewed-by: Thiago Macieira (cherry picked from commit 48c8072bb8862b442170687a9a5f8780332c39b5) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qstringconverter.cpp | 4 ++-- src/corelib/text/qstringconverter_base.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 9142533830e..73fe55d07c1 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -1991,7 +1991,7 @@ const char *QStringConverter::name() const noexcept */ std::optional QStringConverter::encodingForName(const char *name) noexcept { - for (int i = 0; i < LastEncoding + 1; ++i) { + for (qsizetype i = 0; i < LastEncoding + 1; ++i) { if (nameMatch(encodingInterfaces[i].name, name)) return QStringConverter::Encoding(i); } @@ -2059,7 +2059,7 @@ static QByteArray parseHtmlMetaForEncoding(QByteArrayView data) if (pos != -1) { pos = charsetSearcher.indexIn(header, pos); if (pos != -1) { - pos += int(qstrlen("charset=")); + pos += qstrlen("charset="); if (pos < header.size() && (header.at(pos) == '\"' || header.at(pos) == '\'')) ++pos; diff --git a/src/corelib/text/qstringconverter_base.h b/src/corelib/text/qstringconverter_base.h index 68900da8f0c..bf464cbb6ff 100644 --- a/src/corelib/text/qstringconverter_base.h +++ b/src/corelib/text/qstringconverter_base.h @@ -129,7 +129,7 @@ protected: : iface(nullptr) {} constexpr explicit QStringConverter(Encoding encoding, Flags f) - : iface(&encodingInterfaces[int(encoding)]), state(f) + : iface(&encodingInterfaces[qsizetype(encoding)]), state(f) {} constexpr explicit QStringConverter(const Interface *i) noexcept : iface(i)