From c2b958dcc02730e54bbaa271d21f88ccb5e6945c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 6 Sep 2016 13:36:02 +0200 Subject: Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-free MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I13a4ce5c268da2b97cbae6612d240398b17186ef Reviewed-by: Jędrzej Nowacki Reviewed-by: Lars Knoll --- .qmake.conf | 2 ++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h | 2 +- tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 12 ++++++------ tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 5 ++--- tests/benchmarks/script/context2d/tst_context2d.cpp | 8 ++++---- .../qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp | 4 ++-- tests/benchmarks/script/sunspider/tst_sunspider.cpp | 4 ++-- tests/benchmarks/script/v8/tst_v8.cpp | 4 ++-- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 1a22398..4406301 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,6 @@ load(qt_build_config) android|boot2qt: CONFIG -= headersclean +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.8.0 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h index 156ff1a..83eca64 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h @@ -618,7 +618,7 @@ namespace WTF { QDataStream& operator<<(QDataStream& stream, const Vector& data) { stream << qint64(data.size()); - foreach (const T& i, data) + for (const T& i : data) stream << i; return stream; } diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 3ce2397..316b34b 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -181,8 +181,8 @@ void tst_QScriptJSTestSuite::runTestFunction(int testIndex) QString suiteShellPath = testSuiteDir.absoluteFilePath("shell.js"); QString suiteShellContents = readFile(suiteShellPath); - QFileInfoList testFileInfos = subSuiteDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = subSuiteDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { if ((tfi.fileName() == "shell.js") || (tfi.fileName() == "browser.js")) continue; @@ -322,12 +322,12 @@ tst_QScriptJSTestSuite::tst_QScriptJSTestSuite() // don't execute any tests on slow machines #if !defined(Q_OS_IRIX) // do all the test suites - QFileInfoList testSuiteDirInfos = testsDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); - foreach (QFileInfo tsdi, testSuiteDirInfos) { + const QFileInfoList testSuiteDirInfos = testsDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + for (const QFileInfo &tsdi : testSuiteDirInfos) { QDir testSuiteDir(tsdi.absoluteFilePath()); // do all the dirs in the test suite - QFileInfoList subSuiteDirInfos = testSuiteDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); - foreach (QFileInfo ssdi, subSuiteDirInfos) { + const QFileInfoList subSuiteDirInfos = testSuiteDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + for (const QFileInfo &ssdi : subSuiteDirInfos) { subSuitePaths.append(ssdi.absoluteFilePath()); QString function = QString::fromLatin1("%0/%1") .arg(testSuiteDir.dirName()).arg(ssdi.fileName()); diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 44ba3b9..2d96cd0 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -179,9 +179,8 @@ tst_QScriptV8TestSuite::tst_QScriptV8TestSuite() ":/tests", ":/") { // One test function per test file. - QFileInfoList testFileInfos; - testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString name = tfi.baseName(); addTestFunction(name); testNames.append(name); diff --git a/tests/benchmarks/script/context2d/tst_context2d.cpp b/tests/benchmarks/script/context2d/tst_context2d.cpp index f89a395..740eafc 100644 --- a/tests/benchmarks/script/context2d/tst_context2d.cpp +++ b/tests/benchmarks/script/context2d/tst_context2d.cpp @@ -104,8 +104,8 @@ void tst_Context2D::newEnvironment() void tst_Context2D::singleExecution_data() { QTest::addColumn("testName"); - QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString name = tfi.baseName(); QTest::newRow(name.toLatin1().constData()) << name; } @@ -136,8 +136,8 @@ void tst_Context2D::repeatedExecution_data() // us to observe potential effects of profiling-based JIT optimizations. QTest::addColumn("testName"); QTest::addColumn("script"); - QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString script = readFile(tfi.absoluteFilePath()); QString name = tfi.baseName(); newEnvironment(); diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp index 716dff4..fbbef38 100644 --- a/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp +++ b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp @@ -74,8 +74,8 @@ tst_QScriptClass_ByteArray::tst_QScriptClass_ByteArray() void tst_QScriptClass_ByteArray::benchmark_data() { QTest::addColumn("testName"); - QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString name = tfi.baseName(); QTest::newRow(name.toLatin1().constData()) << name; } diff --git a/tests/benchmarks/script/sunspider/tst_sunspider.cpp b/tests/benchmarks/script/sunspider/tst_sunspider.cpp index e09f5cb..cc462aa 100644 --- a/tests/benchmarks/script/sunspider/tst_sunspider.cpp +++ b/tests/benchmarks/script/sunspider/tst_sunspider.cpp @@ -90,8 +90,8 @@ void tst_SunSpider::cleanup() void tst_SunSpider::benchmark_data() { QTest::addColumn("testName"); - QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString name = tfi.baseName(); QTest::newRow(name.toLatin1().constData()) << name; } diff --git a/tests/benchmarks/script/v8/tst_v8.cpp b/tests/benchmarks/script/v8/tst_v8.cpp index c4821cd..e7c8206 100644 --- a/tests/benchmarks/script/v8/tst_v8.cpp +++ b/tests/benchmarks/script/v8/tst_v8.cpp @@ -90,8 +90,8 @@ void tst_V8::cleanup() void tst_V8::benchmark_data() { QTest::addColumn("testName"); - QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); - foreach (QFileInfo tfi, testFileInfos) { + const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files); + for (const QFileInfo &tfi : testFileInfos) { QString name = tfi.baseName(); if (name == QString::fromLatin1("base")) { // base.js contains the benchmark library, it's not a test. -- cgit v1.2.1