tests/auto/gui: Remove some placeholder formatting.

Use QByteArray/QString addition instead in loops and for
test row names.

Change-Id: I31adb60bdaf7ea243143a9244b6c4f66f38b189d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

5 files changed, 33 insertions, 14 deletions

diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 878c03e563..2308f4f215 100644
--- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
@@ -916,21 +916,37 @@ void tst_QCssParser::marginValue_data()
     int ex = QFontMetrics(f).xHeight();
     int em = QFontMetrics(f).height();
 
+    const QString ex1234 = QString::number(ex) + QLatin1Char(' ') + QString::number(2 * ex)
+        + QLatin1Char(' ') + QString::number(3 * ex) + QLatin1Char(' ')
+        + QString::number(4 * ex);
+    const QString em2ex4 = QLatin1String("1 ") + QString::number(2*em) + QLatin1String(" 3 ")
+        + QString::number(4 * ex);
+
     QTest::newRow("one value") << "margin: 1px" << "1 1 1 1";
     QTest::newRow("two values") << "margin: 1px 2px" << "1 2 1 2";
     QTest::newRow("three value") << "margin: 1px 2px 3px" << "1 2 3 2";
     QTest::newRow("four values") << "margin: 1px 2px 3px 4px" << "1 2 3 4";
     QTest::newRow("default px") << "margin: 1 2 3 4" << "1 2 3 4";
     QTest::newRow("no unit") << "margin: 1 2 3 4" << "1 2 3 4";
-    QTest::newRow("em") << "margin: 1ex 2ex 3ex 4ex" << QString("%1 %2 %3 %4").arg(ex).arg(2*ex).arg(3*ex).arg(4*ex);
-    QTest::newRow("ex") << "margin: 1 2em 3px 4ex" << QString("%1 %2 %3 %4").arg(1).arg(2*em).arg(3).arg(4*ex);
+    QTest::newRow("em") << "margin: 1ex 2ex 3ex 4ex"
+        << (QString::number(ex) + QLatin1Char(' ') + QString::number(2 * ex)
+            + QLatin1Char(' ') + QString::number(3 * ex) + QLatin1Char(' ')
+            + QString::number(4 * ex));
+    QTest::newRow("ex") << "margin: 1 2em 3px 4ex"
+        << (QLatin1String("1 ") + QString::number(2 * em) + QLatin1String(" 3 ")
+           + QString::number(4 * ex));
 
     f.setPointSize(20);
     f.setBold(true);
     ex = QFontMetrics(f).xHeight();
     em = QFontMetrics(f).height();
-    QTest::newRow("em2") << "font: bold 20pt; margin: 1ex 2ex 3ex 4ex" << QString("%1 %2 %3 %4").arg(ex).arg(2*ex).arg(3*ex).arg(4*ex);
-    QTest::newRow("ex2") << "margin: 1 2em 3px 4ex; font-size: 20pt; font-weight: bold;" << QString("%1 %2 %3 %4").arg(1).arg(2*em).arg(3).arg(4*ex);
+    QTest::newRow("em2") << "font: bold 20pt; margin: 1ex 2ex 3ex 4ex"
+        << (QString::number(ex) + QLatin1Char(' ') + QString::number(2 * ex)
+            + QLatin1Char(' ') + QString::number(3 * ex) + QLatin1Char(' ')
+            + QString::number(4 * ex));
+    QTest::newRow("ex2") << "margin: 1 2em 3px 4ex; font-size: 20pt; font-weight: bold;"
+        << (QLatin1String("1 ") + QString::number(2 * em) + QLatin1String(" 3 ")
+            + QString::number(4 * ex));
 
     QTest::newRow("crap") << "margin: crap" << "0 0 0 0";
 }
@@ -963,7 +979,8 @@ void tst_QCssParser::marginValue()
     int p[4];
     int spacing;
     v.extractBox(m, p, &spacing);
-    QString str = QString("%1 %2 %3 %4").arg(m[0]).arg(m[1]).arg(m[2]).arg(m[3]);
+    QString str = QString::number(m[0]) + QLatin1Char(' ') + QString::number(m[1])
+        + QLatin1Char(' ') + QString::number(m[2]) + QLatin1Char(' ') + QString::number(m[3]);
     QCOMPARE(str, expectedMargin);
     }
 }
@@ -1090,7 +1107,7 @@ void tst_QCssParser::styleSelector()
     QFETCH(QString, xml);
     QFETCH(QString, elementToCheck);
 
-    QString css = QString("%1 { background-color: green }").arg(selector);
+    const QString css = selector + QLatin1String(" { background-color: green }");
     QCss::Parser parser(css);
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
@@ -1154,7 +1171,7 @@ void tst_QCssParser::specificity()
 {
     QFETCH(QString, selector);
 
-    QString css = QString("%1 { }").arg(selector);
+    QString css = selector + QLatin1String(" { }");
     QCss::Parser parser(css);
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 70d2842a93..844a091495 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -679,7 +679,7 @@ static inline QByteArray msgNotAcceptableFont(const QString &defaultFamily, cons
 {
     QString res = QString::fromLatin1("Font family '%1' is not one of the following acceptable results: ").arg(defaultFamily);
     Q_FOREACH (const QString &family, acceptableFamilies)
-        res += QString::fromLatin1("\n %1").arg(family);
+        res += QLatin1String("\n ") + family;
     return res.toLocal8Bit();
 }
 
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 7378ca85ee..ef96cda97d 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -216,8 +216,8 @@ public:
 QString tst_QTextDocument::cssFontSizeString(const QFont &font)
 {
     return font.pointSize() >= 0
-            ? QStringLiteral("%1pt").arg(font.pointSizeF())
-            : QStringLiteral("%1px").arg(font.pixelSize());
+            ? QString::number(font.pointSizeF()) + QStringLiteral("pt")
+            : QString::number(font.pixelSize()) + QStringLiteral("px");
 }
 
 // Testing get/set functions
@@ -3082,7 +3082,7 @@ void tst_QTextDocument::baseUrl()
     document.setBaseUrl(base);
     QCOMPARE(document.baseUrl(), base);
 
-    document.setHtml(QString("<img src='%1'/>").arg(resource.toString()));
+    document.setHtml(QLatin1String("<img src='") + resource.toString() + QLatin1String("'/>"));
     document.resource(QTextDocument::ImageResource, resource);
     QCOMPARE(document.loadedResource(), loaded);
 }
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 1cd9d9bcbe..2ec64e5acc 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -1177,9 +1177,11 @@ void tst_QTextDocumentFragment::copySubTable()
         fmt.setColumnWidthConstraints(constraints);
 
         QTextTable *table = cursor.insertTable(4, 4, fmt);
-        for (int row = 0; row < 4; ++row)
+        for (int row = 0; row < 4; ++row) {
+            const QString rowS = QString::number(row) + QLatin1Char('/');
             for (int col = 0; col < 4; ++col)
-                table->cellAt(row, col).firstCursorPosition().insertText(QString("%1/%2").arg(row).arg(col));
+                table->cellAt(row, col).firstCursorPosition().insertText(rowS + QString::number(col));
+        }
 
         QCOMPARE(table->format().columnWidthConstraints().count(), table->columns());
 
diff --git a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
index f12bbbdd7e..17541912ce 100644
--- a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -135,7 +135,7 @@ void tst_QTextOdfWriter::testWriteParagraph_data()
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">foobar <text:s text:c=\"2\"/>word<text:tab/>tab x</text:span></text:p>";
     QTest::newRow("misc2") << "\t     \tFoo" <<
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\"><text:tab/> <text:s text:c=\"4\"/><text:tab/>Foo</text:span></text:p>";
-    QTest::newRow("linefeed") << QString("line1%1line2").arg(QChar(0x2028)) <<
+    QTest::newRow("linefeed") << (QStringLiteral("line1") + QChar(0x2028) + QStringLiteral("line2")) <<
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">line1<text:line-break/>line2</text:span></text:p>";
     QTest::newRow("spaces") << "The quick brown fox jumped over the lazy dog" <<
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">The quick brown fox jumped over the lazy dog</text:span></text:p>";