From 8f0c366087edf8c1a6b8c2e299f18c8d269269c4 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 19 Dec 2022 17:12:44 +0200 Subject: [PATCH] QStringConverter: don't shadow variables Change-Id: I3c209585de2a7599f1cd4e58c1d3b3501425b903 Reviewed-by: Marc Mutz --- src/corelib/text/qstringconverter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 04bd8e97338..e9ceb380393 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -503,7 +503,6 @@ QByteArray QUtf8::convertFromUnicode(QStringView in, QStringConverterBase::State char *QUtf8::convertFromUnicode(char *out, QStringView in, QStringConverter::State *state) { Q_ASSERT(state); - const QChar *uc = in.data(); qsizetype len = in.size(); if (!len) return out; @@ -521,7 +520,7 @@ char *QUtf8::convertFromUnicode(char *out, QStringView in, QStringConverter::Sta }; uchar *cursor = reinterpret_cast(out); - const char16_t *src = reinterpret_cast(uc); + const char16_t *src = in.utf16(); const char16_t *const end = src + len; if (!(state->flags & QStringDecoder::Flag::Stateless)) {