1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eradicate Q_FOREACHs over QVarLengthArray

Browse Source 
There is no excuse for copying several KiBs of data just to iterate
over it, yet that's exactly what Q_FOREACH does.

Besides, this use of Q_FOREACH is being deprecated. In my tree, it's
already a hard error.

Change-Id: I07240c37626f7d284781e8c4be05eef3c7a54f39
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Marc Mutz 2019-07-05 19:11:29 +02:00
parent 43c964b8ad
commit e99b0016e8
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/tools/collections/tst_collections.cpp
View File

@ -3484,9 +3484,6 @@ void tst_Collections::foreach_2()
QCOMPARE(varl1.count(), intlist.count()); QCOMPARE(varl1.count(), intlist.count());
QCOMPARE(varl2.count(), intlist.count()); QCOMPARE(varl2.count(), intlist.count());
QCOMPARE(varl3.count(), intlist.count()); QCOMPARE(varl3.count(), intlist.count());
foreach_test_arrays(varl1);
foreach_test_arrays(varl2);
foreach_test_arrays(varl3);
QVarLengthArray<QString> varl4; QVarLengthArray<QString> varl4;
QVarLengthArray<QString, 3> varl5; QVarLengthArray<QString, 3> varl5;
@ -3499,9 +3496,6 @@ void tst_Collections::foreach_2()
QCOMPARE(varl4.count(), strlist.count()); QCOMPARE(varl4.count(), strlist.count());
QCOMPARE(varl5.count(), strlist.count()); QCOMPARE(varl5.count(), strlist.count());
QCOMPARE(varl6.count(), strlist.count()); QCOMPARE(varl6.count(), strlist.count());
foreach_test_arrays(varl4);
foreach_test_arrays(varl5);
foreach_test_arrays(varl6);
} }
struct IntOrString struct IntOrString

2
tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
View File

@ -827,7 +827,7 @@ void tst_QVarLengthArray::operators()
// +=: not provided, emulate // +=: not provided, emulate
//myvla += myvlatwo; //myvla += myvlatwo;
Q_FOREACH (const QString &s, myvlatwo) for (const QString &s : qAsConst(myvlatwo))
myvla.push_back(s); myvla.push_back(s);
QCOMPARE(myvla, combined); QCOMPARE(myvla, combined);