tests/auto/widgets: Remove some placeholder formatting.

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

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

1 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index ecf72613da..7b5fd34f44 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -230,7 +230,7 @@ void tst_QListWidget::populate()
 void tst_QListWidget::addItem()
 {
     int count = testWidget->count();
-    QString label = QString("%1").arg(count);
+    const QString label = QString::number(count);
     testWidget->addItem(label);
     QCOMPARE(testWidget->count(), ++count);
     QCOMPARE(testWidget->item(testWidget->count()-1)->text(), label);
@@ -244,7 +244,7 @@ void tst_QListWidget::addItem2()
     testWidget->addItem(0);
     QCOMPARE(testWidget->count(), count);
 
-    QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(count));
+    QListWidgetItem *item = new QListWidgetItem(QString::number(count));
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     testWidget->addItem(item);
     QCOMPARE(testWidget->count(), ++count);
@@ -261,10 +261,10 @@ void tst_QListWidget::addItems()
     QCOMPARE(testWidget->count(), count);
 
     QStringList stringList;
-    QString label = QString("%1").arg(count);
-    stringList << QString("%1").arg(testWidget->count() + 1)
-               << QString("%1").arg(testWidget->count() + 2)
-               << QString("%1").arg(testWidget->count() + 3)
+    QString label = QString::number(count);
+    stringList << QString::number(testWidget->count() + 1)
+               << QString::number(testWidget->count() + 2)
+               << QString::number(testWidget->count() + 3)
                << label;
     testWidget->addItems(stringList);
     QCOMPARE(testWidget->count(), count + stringList.count());
@@ -276,7 +276,7 @@ void tst_QListWidget::openPersistentEditor()
 {
     // Boundary checking
     testWidget->openPersistentEditor(0);
-    QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
+    QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->openPersistentEditor(item);
 
     int childCount = testWidget->viewport()->children().count();
@@ -290,7 +290,7 @@ void tst_QListWidget::closePersistentEditor()
     // Boundary checking
     int childCount = testWidget->viewport()->children().count();
     testWidget->closePersistentEditor(0);
-    QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
+    QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->closePersistentEditor(item);
     QCOMPARE(childCount, testWidget->viewport()->children().count());
 
@@ -316,7 +316,7 @@ void tst_QListWidget::setItemHidden()
         if (testWidget->isItemHidden(testWidget->item(i)))
             totalHidden++;
 
-    QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
+    QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->addItem(item);
 
     // Check that nothing else changed
@@ -362,7 +362,7 @@ void tst_QListWidget::setCurrentItem()
 {
     QFETCH(int, fill);
     for (int i = 0; i < fill; ++i)
-        testWidget->addItem(QString("%1").arg(i));
+        testWidget->addItem(QString::number(i));
 
     // Boundary checking
     testWidget->setCurrentItem((QListWidgetItem *)0);
@@ -394,7 +394,7 @@ void tst_QListWidget::setCurrentRow()
 {
     QFETCH(int, fill);
     for (int i = 0; i < fill; ++i)
-        testWidget->addItem(QString("%1").arg(i));
+        testWidget->addItem(QString::number(i));
 
     // Boundary checking
     testWidget->setCurrentRow(-1);
@@ -455,7 +455,7 @@ void tst_QListWidget::editItem()
 {
     // Boundary checking
     testWidget->editItem(0);
-    QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
+    QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->editItem(item);
 
     QFETCH(bool, editable);
@@ -650,7 +650,7 @@ void tst_QListWidget::item()
         QCOMPARE(item, static_cast<QListWidgetItem*>(0));
         QCOMPARE(testWidget->count(), 3);
     } else {
-        QCOMPARE(item->text(), QString("item%1").arg(row));
+        QCOMPARE(item->text(), QStringLiteral("item") + QString::number(row));
         QCOMPARE(testWidget->count(), 3);
     }
 }
@@ -683,7 +683,7 @@ void tst_QListWidget::takeItem()
         QCOMPARE(item, static_cast<QListWidgetItem*>(0));
         QCOMPARE(testWidget->count(), 3);
     } else {
-        QCOMPARE(item->text(), QString("item%1").arg(row));
+        QCOMPARE(item->text(), QStringLiteral("item") + QString::number(row));
         QCOMPARE(testWidget->count(), 2);
     }
 
@@ -746,7 +746,7 @@ void tst_QListWidget::selectedItems()
 
     //insert items
     for (int i=0; i<itemCount; ++i)
-        new QListWidgetItem(QString("Item%1").arg(i), testWidget);
+        new QListWidgetItem(QStringLiteral("Item") + QString::number(i), testWidget);
 
     //test the selection
     testWidget->setSelectionMode(QListWidget::SingleSelection);
@@ -1245,8 +1245,8 @@ void tst_QListWidget::insertItemsWithSorting_data()
         QStringList ascendingItems;
         QStringList reverseItems;
         for (int i = 'a'; i <= 'z'; ++i) {
-            ascendingItems << QString("%0").arg(QLatin1Char(i));
-            reverseItems << QString("%0").arg(QLatin1Char('z' - i + 'a'));
+            ascendingItems << QString(1, QLatin1Char(i));
+            reverseItems << QString(1, QLatin1Char('z' - i + 'a'));
             ascendingRows << i - 'a';
             reverseRows << 'z' - i + 'a';
         }
@@ -1490,7 +1490,7 @@ void tst_QListWidget::fastScroll()
     QWidget topLevel;
     MyListWidget widget(&topLevel);
     for (int i = 0; i < 50; ++i)
-        widget.addItem(QString("Item %1").arg(i));
+        widget.addItem(QStringLiteral("Item ") + QString::number(i));
 
     topLevel.resize(300, 300); // toplevel needs to be wide enough for the item
     topLevel.show();