From eb55e2980efc435f8728838910272e32287a841d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 11 Aug 2022 15:25:48 +0200 Subject: 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 Reviewed-by: Thiago Macieira --- src/corelib/text/qstringconverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') 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])); -- cgit v1.2.3