From ba8b0fdcf7a67d4f4b5eab7e3e5ad56056bdb1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 19 Oct 2023 14:38:25 +0200 Subject: [PATCH] QLocal8Bit::convertToUnicode[win]: Fix indentation To make future changes easier to read Pick-to: 6.5 Task-number: QTBUG-118318 Task-number: QTBUG-105105 Change-Id: I431c83b956c179b1d04c2bf51b744227f8b136be Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne (cherry picked from commit 3a5339b4187c63acd0ea924937042f61150d2e06) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qstringconverter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 6485198e62d..6f3bb3e4707 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -1360,9 +1360,8 @@ QString QLocal8Bit::convertToUnicode_sys(QByteArrayView in, quint32 codePage, mb, mblen, wc.data(), wc.length()))) { int r = GetLastError(); if (r == ERROR_INSUFFICIENT_BUFFER) { - const int wclen = MultiByteToWideChar(codePage, MB_PRECOMPOSED, - mb, mblen, 0, 0); - wc.resize(wclen); + const int wclen = MultiByteToWideChar(codePage, MB_PRECOMPOSED, mb, mblen, 0, 0); + wc.resize(wclen); } else if (r == ERROR_NO_UNICODE_TRANSLATION) { //find the last non NULL character while (mblen > 1 && !(mb[mblen-1]))