From a1e7c6421c3b08496b74d72fcf564db1bace09c7 Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Fri, 2 Sep 2022 17:42:58 +0200 Subject: uic: change the first parameter of pixCall to Q1LSV While working on QTBUG-98434 some improvements for the pre-existing code were found during the code review. The first parameter is the base of the QString created by the function but it is not needed as an actual QString, it is just appended to. Change the type from QString to QL1SV. Task-number: QTBUG-103100 Change-Id: I8042a921628e84d951dcfd2fd12154bf74dd5162 Reviewed-by: Marc Mutz Reviewed-by: Sona Kurazyan --- src/tools/uic/cpp/cppwriteinitialization.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 56ce2d00278..b6cadf03e88 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2047,7 +2047,8 @@ QString WriteInitialization::iconCall(const DomProperty *icon) QString WriteInitialization::pixCall(const DomProperty *p) const { - QString type, s; + QLatin1StringView type; + QString s; switch (p->kind()) { case DomProperty::IconSet: type = "QIcon"_L1; @@ -2066,23 +2067,22 @@ QString WriteInitialization::pixCall(const DomProperty *p) const return pixCall(type, s); } -QString WriteInitialization::pixCall(const QString &t, const QString &text) const +QString WriteInitialization::pixCall(QLatin1StringView t, const QString &text) const { - QString type = t; - if (text.isEmpty()) { - type += "()"_L1; - return type; - } + if (text.isEmpty()) + return t % "()"_L1; - QTextStream str(&type); + QString result; + QTextStream str(&result); + str << t; str << '('; - QString pixFunc = m_uic->pixmapFunction(); + const QString pixFunc = m_uic->pixmapFunction(); if (pixFunc.isEmpty()) str << language::qstring(text, m_dindent); else str << pixFunc << '(' << language::charliteral(text, m_dindent) << ')'; str << ')'; - return type; + return result; } void WriteInitialization::initializeComboBox(DomWidget *w) -- cgit v1.2.3