aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-06-20 10:16:34 +0200
committerhjk <hjk@qt.io>2019-06-20 12:03:00 +0000
commit0ec860009ab8b3fe0cfe5d47c2f348cd8704d4b3 (patch)
tree733f2c2a6573b28efe9fc473ff183dc634177f84 /src
parent4b886e12dd4e5756cedf5fb9fc1d9563094363f6 (diff)
Replace uses of QString::sprintf()
There are patches appearing on gerrit for Qt 6 to remove the functions. Change-Id: Ic189c0a19ddc0f84eb34a56c0861532303de5129 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/qmleditorwidgets/colorbox.cpp6
-rw-r--r--src/plugins/cppeditor/cppquickfixes.cpp9
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp6
-rw-r--r--src/shared/proparser/qmakebuiltins.cpp3
4 files changed, 8 insertions, 16 deletions
diff --git a/src/libs/qmleditorwidgets/colorbox.cpp b/src/libs/qmleditorwidgets/colorbox.cpp
index ad8109c27d..b0da2642e2 100644
--- a/src/libs/qmleditorwidgets/colorbox.cpp
+++ b/src/libs/qmleditorwidgets/colorbox.cpp
@@ -29,12 +29,10 @@
static inline QString properName(const QColor &color)
{
- QString s;
if (color.alpha() == 255)
- s.sprintf("#%02x%02x%02x", color.red(), color.green(), color.blue());
+ return QString::asprintf("#%02x%02x%02x", color.red(), color.green(), color.blue());
else
- s.sprintf("#%02x%02x%02x%02x", color.alpha(), color.red(), color.green(), color.blue());
- return s;
+ return QString::asprintf("#%02x%02x%02x%02x", color.alpha(), color.red(), color.green(), color.blue());
}
static inline QColor properColor(const QString &str)
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index bec9f419e6..538c9242b8 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -1510,8 +1510,7 @@ void ConvertNumericLiteral::match(const CppQuickFixInterface &interface, QuickFi
0x20
*/
- QString replacement;
- replacement.sprintf("0x%lX", value);
+ const QString replacement = QString::asprintf("0x%lX", value);
auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
op->setDescription(QApplication::translate("CppTools::QuickFix", "Convert to Hexadecimal"));
op->setPriority(priority);
@@ -1528,8 +1527,7 @@ void ConvertNumericLiteral::match(const CppQuickFixInterface &interface, QuickFi
With
040
*/
- QString replacement;
- replacement.sprintf("0%lo", value);
+ const QString replacement = QString::asprintf("0%lo", value);
auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
op->setDescription(QApplication::translate("CppTools::QuickFix", "Convert to Octal"));
op->setPriority(priority);
@@ -1546,8 +1544,7 @@ void ConvertNumericLiteral::match(const CppQuickFixInterface &interface, QuickFi
With
32
*/
- QString replacement;
- replacement.sprintf("%lu", value);
+ const QString replacement = QString::asprintf("%lu", value);
auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
op->setDescription(QApplication::translate("CppTools::QuickFix", "Convert to Decimal"));
op->setPriority(priority);
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 08105bf2be..8ab244fe2b 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -41,12 +41,10 @@ using namespace QmlDesigner::Internal;
inline static QString properColorName(const QColor &color)
{
- QString s;
if (color.alpha() == 255)
- s.sprintf("#%02x%02x%02x", color.red(), color.green(), color.blue());
+ return QString::asprintf("#%02x%02x%02x", color.red(), color.green(), color.blue());
else
- s.sprintf("#%02x%02x%02x%02x", color.alpha(), color.red(), color.green(), color.blue());
- return s;
+ return QString::asprintf("#%02x%02x%02x%02x", color.alpha(), color.red(), color.green(), color.blue());
}
inline static QString doubleToString(double d)
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index ea7e308cc5..916d4ab891 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -877,8 +877,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
ret += values(map(args.at(0)));
break;
case E_LIST: {
- QString tmp;
- tmp.sprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
+ const QString tmp = QString::asprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
ret = ProStringList(ProString(tmp));
ProStringList lst;
for (const ProString &arg : args)