summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-05-03 12:19:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-05-03 12:29:07 +0200
commitda009628dc4b8f0bef3937d244d8c5c3fbd497cc (patch)
tree054caf06814113c13b47c520556dd4881a9ad178 /src/shared
parent84121904e0fa8801b5cc95981d5500ba9bc312d8 (diff)
downloadqttools-da009628dc4b8f0bef3937d244d8c5c3fbd497cc.tar.gz
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 <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/deviceskin/deviceskin.cpp3
-rw-r--r--src/shared/qtpropertybrowser/qtpropertymanager.cpp28
2 files changed, 14 insertions, 17 deletions
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)));
}
/*!