From da009628dc4b8f0bef3937d244d8c5c3fbd497cc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 May 2023 12:19:37 +0200 Subject: Fix static analysis/clazy warnings about QString::arg()/multi In some cases, remove QString::number() for int. Pick-to: 6.5 Change-Id: I60260afbbb3045448025983e37974667f2eeb51a Reviewed-by: Jarek Kobus --- src/assistant/help/qhelpdbreader.cpp | 3 +-- src/designer/src/lib/uilib/properties_p.h | 2 +- src/shared/deviceskin/deviceskin.cpp | 3 ++- src/shared/qtpropertybrowser/qtpropertymanager.cpp | 28 ++++++++++------------ src/uiplugin/customwidget.h | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/assistant/help/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp index bf42bbae7..9e308cdad 100644 --- a/src/assistant/help/qhelpdbreader.cpp +++ b/src/assistant/help/qhelpdbreader.cpp @@ -489,8 +489,7 @@ QMultiMap QHelpDBReader::filesData(const QStringList &filte "AND FileNameTable.FileId = FileFilterTable.FileId " "AND FileFilterTable.FilterAttributeId = FilterAttributeTable.Id " "AND FilterAttributeTable.Name = \'%1\' %2")) - .arg(quote(filterAttributes.at(i))) - .arg(extension)); + .arg(quote(filterAttributes.at(i)), extension)); } } m_query->exec(query); diff --git a/src/designer/src/lib/uilib/properties_p.h b/src/designer/src/lib/uilib/properties_p.h index 2050cf1a5..361975f9a 100644 --- a/src/designer/src/lib/uilib/properties_p.h +++ b/src/designer/src/lib/uilib/properties_p.h @@ -92,7 +92,7 @@ inline EnumType enumKeyToValue(const QMetaEnum &metaEnum,const char *key, const if (val == -1) { uiLibWarning(QCoreApplication::translate("QFormBuilder", "The enumeration-value '%1' is invalid. The default value '%2' will be used instead.") - .arg(QString::fromUtf8(key)).arg(QString::fromUtf8(metaEnum.key(0)))); + .arg(QString::fromUtf8(key), QString::fromUtf8(metaEnum.key(0)))); val = metaEnum.value(0); } return static_cast(val); diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index f9282fb2e..32ab0b07c 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -107,7 +107,8 @@ bool DeviceSkinParameters::read(const QString &skinDirectory, ReadMode rm, QSt QTextStream ts(&f); const bool rc = read(ts, rm, errorMessage); if (!rc) - *errorMessage = DeviceSkin::tr("The skin configuration file '%1' could not be read: %2").arg(fn).arg(*errorMessage); + *errorMessage = DeviceSkin::tr("The skin configuration file '%1' could not be read: %2") + .arg(fn, *errorMessage); return rc; } bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMessage) diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index 3f18ef26f..bc7bcf129 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -2575,8 +2575,7 @@ QString QtPointPropertyManager::valueText(const QtProperty *property) const if (it == d_ptr->m_values.constEnd()) return QString(); const QPoint v = it.value(); - return tr("(%1, %2)").arg(QString::number(v.x())) - .arg(QString::number(v.y())); + return tr("(%1, %2)").arg(v.x()).arg(v.y()); } /*! @@ -2815,8 +2814,8 @@ QString QtPointFPropertyManager::valueText(const QtProperty *property) const return QString(); const QPointF v = it.value().val; const int dec = it.value().decimals; - return tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec)) - .arg(QString::number(v.y(), 'f', dec)); + return tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec), + QString::number(v.y(), 'f', dec)); } /*! @@ -3134,8 +3133,7 @@ QString QtSizePropertyManager::valueText(const QtProperty *property) const if (it == d_ptr->m_values.constEnd()) return QString(); const QSize v = it.value().val; - return tr("%1 x %2").arg(QString::number(v.width())) - .arg(QString::number(v.height())); + return tr("%1 x %2").arg(v.width()).arg(v.height()); } /*! @@ -3498,8 +3496,8 @@ QString QtSizeFPropertyManager::valueText(const QtProperty *property) const return QString(); const QSizeF v = it.value().val; const int dec = it.value().decimals; - return tr("%1 x %2").arg(QString::number(v.width(), 'f', dec)) - .arg(QString::number(v.height(), 'f', dec)); + return tr("%1 x %2").arg(QString::number(v.width(), 'f', dec), + QString::number(v.height(), 'f', dec)); } /*! @@ -3890,10 +3888,8 @@ QString QtRectPropertyManager::valueText(const QtProperty *property) const if (it == d_ptr->m_values.constEnd()) return QString(); const QRect v = it.value().val; - return tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x())) - .arg(QString::number(v.y())) - .arg(QString::number(v.width())) - .arg(QString::number(v.height())); + return tr("[(%1, %2), %3 x %4]").arg(v.x()) .arg(v.y()) + .arg(v.width()).arg(v.height()); } /*! @@ -4320,10 +4316,10 @@ QString QtRectFPropertyManager::valueText(const QtProperty *property) const return QString(); const QRectF v = it.value().val; const int dec = it.value().decimals; - return QString(tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x(), 'f', dec)) - .arg(QString::number(v.y(), 'f', dec)) - .arg(QString::number(v.width(), 'f', dec)) - .arg(QString::number(v.height(), 'f', dec))); + return QString(tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x(), 'f', dec), + QString::number(v.y(), 'f', dec), + QString::number(v.width(), 'f', dec), + QString::number(v.height(), 'f', dec))); } /*! diff --git a/src/uiplugin/customwidget.h b/src/uiplugin/customwidget.h index 2a47a32f8..d631d0438 100644 --- a/src/uiplugin/customwidget.h +++ b/src/uiplugin/customwidget.h @@ -35,7 +35,7 @@ public: virtual QString domXml() const { return QString::fromUtf8("") - .arg(name()).arg(name().toLower()); + .arg(name(), name().toLower()); } virtual QString codeTemplate() const { return QString(); } -- cgit v1.2.1