diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-16 09:38:51 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-19 12:39:16 +0000 |
commit | 52d5b272394f5d1fd84d5c44af78e3b87d264766 (patch) | |
tree | 2f03119fab864c4ce41e83185f3c317e647484c4 /tests/auto/widgets/util | |
parent | 240d768ca6ef41bf661a1fb8e1bde408e25ba553 (diff) |
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>
Diffstat (limited to 'tests/auto/widgets/util')
-rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index e8369ef9bd..fdeb6d100d 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -367,7 +367,7 @@ void tst_QCompleter::csMatchingOnCsSortedModel_data() QTest::addColumn<QString>("completion"); QTest::addColumn<QString>("completionText"); -#define ROWNAME(name) (qPrintable(QString("%1 %2").arg(name).arg(i))) +#define ROWNAME(name) ((QByteArray(name) + ' ' + QByteArray::number(i)).constData()) for (int i = 0; i < 2; i++) { if (i == 1) @@ -1164,7 +1164,7 @@ void tst_QCompleter::dynamicSortOrder() completer.setModelSorting(QCompleter::CaseSensitivelySortedModel); QStandardItem *root = model.invisibleRootItem(); for (int i = 0; i < 20; i++) { - root->appendRow(new QStandardItem(QString("%1").arg(i))); + root->appendRow(new QStandardItem(QString::number(i))); } root->appendRow(new QStandardItem("13")); root->sortChildren(0, Qt::AscendingOrder); @@ -1256,7 +1256,7 @@ void tst_QCompleter::task189564_omitNonSelectableItems() QStringList strings; for (int i = 0; i < n; ++i) - strings << QString("%1%2").arg(prefix).arg(i); + strings << prefix + QString::number(i); const QString omitString(strings.at(n / 2)); task189564_StringListModel model(omitString); model.setStringList(strings); @@ -1553,9 +1553,9 @@ void tst_QCompleter::task247560_keyboardNavigation() QStandardItemModel model; for (int i = 0; i < 5; i++) { - for (int j = 0; j < 5; j++) { - model.setItem(i, j, new QStandardItem(QString("row %1 column %2").arg(i).arg(j))); - } + const QString prefix = QLatin1String("row ") + QString::number(i) + QLatin1String(" column "); + for (int j = 0; j < 5; j++) + model.setItem(i, j, new QStandardItem(prefix + QString::number(j))); } |