From d84b84ac82e029e6ffaa213d2bb6af397f2e3278 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 20 Jul 2022 14:06:59 +0200 Subject: [PATCH] Port QCollator/Posix to qsizetype Task-number: QTBUG-105038 Change-Id: If0cbe82105b753dfebfe1fa1ca7cbd759012e3d5 Reviewed-by: Sona Kurazyan Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira (cherry picked from commit 538378f2297cf7299270b09ddca3e4a5e7f8be82) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qcollator_posix.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp index bddb7485351..54c700015b7 100644 --- a/src/corelib/text/qcollator_posix.cpp +++ b/src/corelib/text/qcollator_posix.cpp @@ -36,7 +36,7 @@ void QCollatorPrivate::cleanup() static void stringToWCharArray(QVarLengthArray &ret, QStringView string) { ret.resize(string.length()); - int len = string.toWCharArray(ret.data()); + qsizetype len = string.toWCharArray(ret.data()); ret.resize(len+1); ret[len] = 0; } @@ -70,7 +70,7 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const std::copy(original.cbegin(), original.cend(), result.begin()); } else { size_t size = std::wcsxfrm(result.data(), original.constData(), string.size()); - if (size > uint(result.size())) { + if (size > size_t(result.size())) { result.resize(size+1); size = std::wcsxfrm(result.data(), original.constData(), string.size()); }