diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-01-06 22:02:50 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-01-12 17:54:28 +0000 |
commit | dcec1420ea9d7e90bbd7f37be15d8e61eaf35d23 (patch) | |
tree | 950020aadfc183963a5668263ef302d8d6b0e6de /src/tools/uic/cpp/cppwriteinitialization.cpp | |
parent | 8f469e4a19feb77758fb5d3c7120ba93cf32cd7d (diff) |
Use QString::asprintf(), QStringBuilder, and the multi-arg overload of QString::arg()
... instead of sequential .arg(const QString &) callings.
It saves memory allocations and prevents unexpected results
if replacing strings contain place markers.
Found with clazy's qstring-arg check.
Change-Id: I3912275a6e11c6fb7559ff5623f2e8cde9b7f07a
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index d69eeebc5c..65d6367d1d 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -152,7 +152,8 @@ namespace { if (const DomResourceIcon *dri = p->elementIconSet()) { if (!isIconFormat44(dri)) { if (dri->text().isEmpty()) { - const QString msg = QString::fromUtf8("%1: Warning: An invalid icon property '%2' was encountered.").arg(fileName).arg(p->attributeName()); + const QString msg = QString::fromLatin1("%1: Warning: An invalid icon property '%2' was encountered.") + .arg(fileName, p->attributeName()); qWarning("%s", qPrintable(msg)); return false; } @@ -162,7 +163,8 @@ namespace { case DomProperty::Pixmap: if (const DomResourcePixmap *drp = p->elementPixmap()) if (drp->text().isEmpty()) { - const QString msg = QString::fromUtf8("%1: Warning: An invalid pixmap property '%2' was encountered.").arg(fileName).arg(p->attributeName()); + const QString msg = QString::fromUtf8("%1: Warning: An invalid pixmap property '%2' was encountered.") + .arg(fileName, p->attributeName()); qWarning("%s", qPrintable(msg)); return false; } @@ -1029,7 +1031,7 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node) const int row = node->attributeRow(); const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1; const QString role = formLayoutRole(node->attributeColumn(), colSpan); - addArgs = QString::fromLatin1("%1, %2, %3").arg(row).arg(role).arg(itemName); + addArgs = QString::fromLatin1("%1, %2, %3").arg(row).arg(role, itemName); } else { addArgs = itemName; if (layout->attributeClass().contains(QLatin1String("Box")) && !node->attributeAlignment().isEmpty()) @@ -1364,7 +1366,7 @@ void WriteInitialization::writeProperties(const QString &varName, case DomProperty::Locale: { const DomLocale *locale = p->elementLocale(); propertyValue = QString::fromLatin1("QLocale(QLocale::%1, QLocale::%2)") - .arg(locale->attributeLanguage()).arg(locale->attributeCountry()); + .arg(locale->attributeLanguage(), locale->attributeCountry()); break; } case DomProperty::SizePolicy: { |