From 70adce61ad8f0df8bdf5f62859cffd75fb7d5843 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 2 Aug 2021 17:23:36 +0200 Subject: [PATCH] replaceArgEscapes(): rename a local variable and simplify initialization The name coincided with one used in other functions for a different meaning and its initialization was clumsy. Rename to a terser name that communicates the relevant matter more clearly. Change-Id: I6baf8e5ec695cbbb1cc10f6c4b4cc6512c1aefc4 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/text/qstring.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index cb4a4b338c..8e9d34a7a9 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -7795,11 +7795,9 @@ static QString replaceArgEscapes(QStringView s, const ArgEscapeData &d, int fiel const QChar *escape_start = c++; - bool locale_arg = false; - if (c->unicode() == 'L') { - locale_arg = true; + const bool localize = c->unicode() == 'L'; + if (localize) ++c; - } int escape = c->digitValue(); if (escape != -1) { @@ -7820,7 +7818,7 @@ static QString replaceArgEscapes(QStringView s, const ArgEscapeData &d, int fiel rc += escape_start - text_start; uint pad_chars; - if (locale_arg) + if (localize) pad_chars = qMax(abs_field_width, larg.length()) - larg.length(); else pad_chars = qMax(abs_field_width, arg.length()) - arg.length(); @@ -7830,7 +7828,7 @@ static QString replaceArgEscapes(QStringView s, const ArgEscapeData &d, int fiel *rc++ = fillChar; } - if (locale_arg) { + if (localize) { memcpy(rc, larg.data(), larg.length()*sizeof(QChar)); rc += larg.length(); }