summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-08-11 15:25:48 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-08-12 07:53:37 +0200
commiteb55e2980efc435f8728838910272e32287a841d (patch)
treeb80f5ce8181e451c6b15dc95771f4eb79223d4c3 /src/corelib
parent42fbd063e24855df444f31e8c4b8ef25416d111c (diff)
QStringConverter: make a narrowing conversion explicit
Int variables are a code smell these days, so make the narrowing conversion (from ptrdiff_t to int) explicit and add a comment. Pick-to: 6.4 6.3 6.2 Task-number: QTBUG-105105 Change-Id: Ia4e14f1cc132ca36d15e9684bfcb4605d7b9251f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/text/qstringconverter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
index c5d17e399e..80523bd809 100644
--- a/src/corelib/text/qstringconverter.cpp
+++ b/src/corelib/text/qstringconverter.cpp
@@ -1218,7 +1218,7 @@ static QString convertToUnicodeCharByChar(QByteArrayView in, QStringConverter::S
QString s;
while ((next = CharNextExA(CP_ACP, mb, 0)) != mb) {
wchar_t wc[2] ={0};
- int charlength = next - mb;
+ int charlength = int(next - mb); // always just a few bytes
int len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED|MB_ERR_INVALID_CHARS, mb, charlength, wc, 2);
if (len>0) {
s.append(QChar(wc[0]));