QtTest: eradicate all Q_FOREACH loops

... by replacing them with C++11 ramge-for loops.

In one case, I took the liberty to remove a useless
if(isEmpty()) check around a for loop. Now that we
don't use Q_FOREACH anymore, we don't incur the copy
for empty containers anymore. Left the indention of
the loop level to avoid code churn.

Saves 1.8KiB in text size on optimized GCC 5.3 Linux
AMD64 builds.

Change-Id: I1b1fb34847f6a631f0d580fd5261c7f5fed8475c
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

3 files changed, 7 insertions, 9 deletions

diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index af500722c6..1de149258d 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -115,13 +115,13 @@ QString QBenchmarkValgrindUtils::getNewestFileName()
     Q_ASSERT(!base.isEmpty());
 
     nameFilters << QString::fromLatin1("%1.*").arg(base);
-    QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
+    const QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
     Q_ASSERT(!fiList.empty());
     int hiSuffix = -1;
     QFileInfo lastFileInfo;
     const QString pattern = QString::fromLatin1("%1.(\\d+)").arg(base);
     QRegExp rx(pattern);
-    foreach (const QFileInfo &fileInfo, fiList) {
+    for (const QFileInfo &fileInfo : fiList) {
         const int index = rx.indexIn(fileInfo.fileName());
         Q_ASSERT(index == 0);
         Q_UNUSED(index);
@@ -151,8 +151,8 @@ void QBenchmarkValgrindUtils::cleanup()
     nameFilters
         << base // overall summary
         << QString::fromLatin1("%1.*").arg(base); // individual dumps
-    QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
-    foreach (const QFileInfo &fileInfo, fiList) {
+    const QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
+    for (const QFileInfo &fileInfo : fiList) {
         const bool removeOk = QFile::remove(fileInfo.fileName());
         Q_ASSERT(removeOk);
         Q_UNUSED(removeOk);
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index b6d8d6028c..c4c79b7deb 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -151,7 +151,7 @@ public:
         return res;
     }
     static bool containsEvent(QAccessibleEvent *event) {
-        Q_FOREACH (const QAccessibleEvent *ev, eventList()) {
+        for (const QAccessibleEvent *ev : qAsConst(eventList())) {
             if (*ev == *event)
                 return true;
         }
@@ -285,7 +285,7 @@ private:
         QDebug str = QDebug(&rc).nospace();
         str << "Event " << *needle
             <<  " not found at head of event list of size " << haystack.size() << " :";
-        Q_FOREACH (const QAccessibleEvent *e, haystack)
+        for (const QAccessibleEvent *e : haystack)
             str << ' ' << *e;
         return rc;
     }
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 4720c0564e..d5b4ae218f 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1694,8 +1694,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
             handler.reset(new FatalSignalHandler);
 #endif
         TestMethods::MetaMethods commandLineMethods;
-        if (!QTest::testFunctions.isEmpty()) {
-            foreach (const QString &tf, QTest::testFunctions) {
+        for (const QString &tf : qAsConst(QTest::testFunctions)) {
                 const QByteArray tfB = tf.toLatin1();
                 const QByteArray signature = tfB + QByteArrayLiteral("()");
                 QMetaMethod m = TestMethods::findMethod(testObject, signature.constData());
@@ -1706,7 +1705,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
                     exit(1);
                 }
                 commandLineMethods.push_back(m);
-            }
         }
         TestMethods test(testObject, commandLineMethods);
         test.invokeTests(testObject);