Eradicate Q_FOREACHs over QVarLengthArray

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>

2 files changed, 1 insertions, 7 deletions

diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index 507b2e8d78..5ba8545b61 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -3484,9 +3484,6 @@ void tst_Collections::foreach_2()
     QCOMPARE(varl1.count(), intlist.count());
     QCOMPARE(varl2.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, 3> varl5;
@@ -3499,9 +3496,6 @@ void tst_Collections::foreach_2()
     QCOMPARE(varl4.count(), strlist.count());
     QCOMPARE(varl5.count(), strlist.count());
     QCOMPARE(varl6.count(), strlist.count());
-    foreach_test_arrays(varl4);
-    foreach_test_arrays(varl5);
-    foreach_test_arrays(varl6);
 }
 
 struct IntOrString
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index a1d0100f96..6220cc766a 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -827,7 +827,7 @@ void tst_QVarLengthArray::operators()
 
     // +=: not provided, emulate
     //myvla += myvlatwo;
-    Q_FOREACH (const QString &s, myvlatwo)
+    for (const QString &s : qAsConst(myvlatwo))
         myvla.push_back(s);
     QCOMPARE(myvla, combined);