tst_QTemporaryDir/File: compile with QT_NO_FOREACH

These are member containers of nested (in the test function) structs.
It's clear the container isn't modified in the loop body, so use
ranged-for and std::as_const.

Remove "#undef QT_NO_FOREACH".

Task-number: QTBUG-115839
Change-Id: I0588bf4b6520b42d6d8678d702192fb894956b05
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 4 insertions, 8 deletions

diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index 2db1f1f98b..3e498170e7 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
-
 #include <QTest>
 #include <QStandardPaths>
 #include <qcoreapplication.h>
@@ -481,7 +479,7 @@ void tst_QTemporaryDir::QTBUG_4796() // unicode support
     {
         ~CleanOnReturn()
         {
-            foreach (const QString &tempName, tempNames)
+            for (const QString &tempName : std::as_const(tempNames))
                 QVERIFY(QDir(tempName).removeRecursively());
         }
 
@@ -551,7 +549,7 @@ void tst_QTemporaryDir::QTBUG_4796() // unicode support
 #ifdef Q_OS_WIN
     QTest::qWait(20);
 #endif
-    foreach (const QString &tempName, cleaner.tempNames)
+    for (const QString &tempName : std::as_const(cleaner.tempNames))
         QVERIFY2(!QDir(tempName).exists(), qPrintable(tempName));
 
     cleaner.reset();
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
index 876931c239..95f1661758 100644
--- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -2,8 +2,6 @@
 // Copyright (C) 2017 Intel Corporation.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
-
 #include <QTest>
 #include <qcoreapplication.h>
 #include <qstring.h>
@@ -860,7 +858,7 @@ void tst_QTemporaryFile::QTBUG_4796()
     {
         ~CleanOnReturn()
         {
-            Q_FOREACH(QString tempName, tempNames)
+            for (const QString &tempName : std::as_const(tempNames))
                 QFile::remove(tempName);
         }
 
@@ -948,7 +946,7 @@ void tst_QTemporaryFile::QTBUG_4796()
         }
     }
 
-    Q_FOREACH(QString const &tempName, cleaner.tempNames)
+    for (const QString &tempName : std::as_const(cleaner.tempNames))
         QVERIFY( !QFile::exists(tempName) );
 
     cleaner.reset();