Eradicate Q_FOREACH loops and mark the module clean

The only noteworth change is where a loop around spy.events modified
the container using takeFirst(). There was no reason to do so, so it
was changed to use the loop variable instead of the result of taking.

Change-Id: I02c62a7c2efc5d042c6e669fe5daddd7da7e85d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
 
 

18 files changed, 67 insertions, 66 deletions

diff --git a/tests/auto/core/common/testpostmanarbiter.cpp b/tests/auto/core/common/testpostmanarbiter.cpp
index 59c59f5ab..ffc5bce5f 100644
--- a/tests/auto/core/common/testpostmanarbiter.cpp
+++ b/tests/auto/core/common/testpostmanarbiter.cpp
@@ -83,7 +83,8 @@ Qt3DCore::QAbstractPostman *TestArbiter::postman() const
 void TestArbiter::setArbiterOnNode(Qt3DCore::QNode *node)
 {
     Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
-    Q_FOREACH (Qt3DCore::QNode *n, node->childNodes())
+    const auto childNodes = node->childNodes();
+    for (Qt3DCore::QNode *n : childNodes)
         setArbiterOnNode(n);
 }
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index dad66c5d5..d8ffbc361 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -1054,23 +1054,22 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
 
     // WHEN
     spy.events.clear();
-    Q_FOREACH (QObject *c, root->children())
-        delete c;
+    qDeleteAll(root->children());
 
     // THEN
     QVERIFY(root->children().count() == 0);
     QCOMPARE(spy.events.size(), 20);
     int i = 0;
-    Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) {
+    for (const ObserverSpy::ChangeRecord &r : qAsConst(spy.events)) {
         QVERIFY(r.wasLocked());
         const Qt3DCore::QNodeId childId = childIds.at(i / 2);
         if (i % 2 == 0) {
-            Qt3DCore::QPropertyNodeRemovedChangePtr additionEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
+            Qt3DCore::QPropertyNodeRemovedChangePtr additionEvent = r.change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
             QCOMPARE(additionEvent->subjectId(), root->id());
             QCOMPARE(additionEvent->removedNodeId(), childId);
             QCOMPARE(additionEvent->metaObject(), &MyQNode::staticMetaObject);
         } else {
-            const Qt3DCore::QNodeDestroyedChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeDestroyedChange>();
+            const Qt3DCore::QNodeDestroyedChangePtr event = r.change().dynamicCast<Qt3DCore::QNodeDestroyedChange>();
             QCOMPARE(event->subjectId(), childId);
             QCOMPARE(event->subtreeIdsAndTypes().count(), 1);
             QCOMPARE(event->subtreeIdsAndTypes().first().id, childId);
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 4beb28bc2..6574a91d9 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -411,12 +411,12 @@ void tst_QChangeArbiter::registerObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
 
     child->setParent(root);
     arbiter->syncChanges();
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QCOMPARE(o->lastChanges().size(), 1);
         QVERIFY(o->lastChanges().last()->type() == Qt3DCore::PropertyValueAdded);
     }
@@ -462,9 +462,9 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         QVERIFY(s->lastChange().isNull());
 
     // WHEN
@@ -472,11 +472,11 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -486,11 +486,11 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -527,7 +527,7 @@ void tst_QChangeArbiter::unregisterObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
 
     // WHEN
@@ -535,20 +535,20 @@ void tst_QChangeArbiter::unregisterObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
 
     // WHEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         arbiter->unregisterObserver(o, root->id());
 
     root->sendAllChangesNotification();
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
@@ -594,9 +594,9 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         QVERIFY(s->lastChange().isNull());
 
     // WHEN
@@ -604,11 +604,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -618,11 +618,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -632,16 +632,16 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueRemoved);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeDeleted);
     }
 
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         arbiter->unregisterSceneObserver(s);
 
     // WHEN
@@ -649,11 +649,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeDeleted);
     }
diff --git a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
index 0f50b5d38..3d2355eb8 100644
--- a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
+++ b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
@@ -605,7 +605,7 @@ void tst_QFrameAllocator::allocateSubclass()
 
     QCOMPARE(composeds.count(), 256);
 
-    Q_FOREACH (composed *c, composeds) {
+    for (composed *c : qAsConst(composeds)) {
         subclass *s = static_cast<subclass *>(c);
         s->toto = 2586.0f;
     }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 36ec14b4e..0a7e6d9b8 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -120,18 +120,18 @@ void tst_QScene::addObservable()
     for (int i = 0; i < 5; i++)
         scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
-    Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
+    const Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
+    const Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     // THEN
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
-    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs1) {
+    for (Qt3DCore::QObservableInterface *o : obs1) {
         QVERIFY(scene->nodeIdFromObservable(o) == node1->id());
         QVERIFY(scene->lookupNode(node1->id()) == nullptr);
     }
-    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs2) {
+    for (Qt3DCore::QObservableInterface *o : obs2) {
         QVERIFY(scene->nodeIdFromObservable(o) == node2->id());
         QVERIFY(scene->lookupNode(node2->id()) == nullptr);
     }
@@ -153,7 +153,7 @@ void tst_QScene::addNodeObservable()
         scene->addObservable(nodes.at(i));
 
     // THEN
-    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
+    for (Qt3DCore::QNode *n : qAsConst(nodes)) {
         QVERIFY(n == scene->lookupNode(n->id()));
         QVERIFY(scene->lookupObservables(n->id()).isEmpty());
     }
@@ -281,7 +281,7 @@ void tst_QScene::addChildNode()
     QCoreApplication::processEvents();
 
     // THEN
-    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
+    for (Qt3DCore::QNode *n : qAsConst(nodes)) {
         QVERIFY(scene->lookupNode(n->id()) == n);
     }
 }
diff --git a/tests/auto/coretest/coretest.pro b/tests/auto/coretest/coretest.pro
index 9bcc56c1b..9a96dcc6f 100644
--- a/tests/auto/coretest/coretest.pro
+++ b/tests/auto/coretest/coretest.pro
@@ -2,7 +2,7 @@ TARGET = Qt3DCoreTest
 MODULE = 3dcoretest
 CONFIG += static internal_module
 
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
+DEFINES += QT_NO_CAST_FROM_ASCII
 PRECOMPILED_HEADER =
 INCLUDEPATH += $$PWD
 
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 123a648d6..0588a14e9 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -100,7 +100,7 @@ private slots:
     void checkInitialAndCleanUpState()
     {
         // GIVEN
-        QFETCH(QList<QComponent*>, components);
+        QFETCH(const QList<QComponent*>, components);
 
         TestRenderer renderer;
         NodeManagers nodeManagers;
@@ -125,7 +125,7 @@ private slots:
         QVERIFY(entity.layerIds().isEmpty());
 
         // WHEN
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             const auto addChange = QComponentAddedChangePtr::create(&dummyFrontendEntity, component);
             entity.sceneChangeEvent(addChange);
         }
@@ -382,7 +382,7 @@ private slots:
     void shouldHandleComponentsEvents()
     {
         // GIVEN
-        QFETCH(QList<QComponent*>, components);
+        QFETCH(const QList<QComponent*>, components);
         QFETCH(void*, functionPtr);
         UuidListMethod method = reinterpret_cast<UuidListMethod>(functionPtr);
 
@@ -395,14 +395,14 @@ private slots:
         QVERIFY(method(&entity).isEmpty());
 
         // WHEN
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             const auto addChange = QComponentAddedChangePtr::create(&dummyFrontendEntity, component);
             entity.sceneChangeEvent(addChange);
         }
 
         // THEN
         QCOMPARE(method(&entity).size(), components.size());
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             QVERIFY(method(&entity).contains(component->id()));
         }
         QVERIFY(renderer.dirtyBits() != 0);
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index 7e288b02a..82ca8448f 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -123,7 +123,8 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer()
     QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count());
 
     int c = 0;
-    Q_FOREACH (QParameter *p, frontendMaterial->parameters())
+    const auto frontendMaterialParameters = frontendMaterial->parameters();
+    for (QParameter *p : frontendMaterialParameters)
         QCOMPARE(p->id(), backend.parameters().at(c++));
 
     delete frontendMaterial;
diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp
index d14bcddcb..9178b9d6f 100644
--- a/tests/auto/render/raycasting/tst_raycasting.cpp
+++ b/tests/auto/render/raycasting/tst_raycasting.cpp
@@ -182,13 +182,13 @@ void tst_RayCasting::shouldReturnAllResults()
                                  &provider));
 
     // WHEN
-    QVector<QCollisionQueryResult> results = service.fetchAllResults();
+    const QVector<QCollisionQueryResult> results = service.fetchAllResults();
 
     // THEN
     bool expectedHandlesFound = true;
-    Q_FOREACH (QQueryHandle expected, handles) {
+    for (QQueryHandle expected : qAsConst(handles)) {
         bool found = false;
-        Q_FOREACH (QCollisionQueryResult result, results) {
+        for (QCollisionQueryResult result : results) {
             if (result.handle() == expected)
                 found = true;
         }
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
index 247c5e0a3..931778c6e 100644
--- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
@@ -58,7 +58,7 @@ private:
                                Qt3DRender::Render::ShaderDataManager *manager)
     {
         // Create children first
-        Q_FOREACH (QObject *c, frontend->children()) {
+        for (QObject *c : frontend->children()) {
             Qt3DRender::QShaderData *cShaderData = qobject_cast<Qt3DRender::QShaderData *>(c);
             if (cShaderData)
                 initBackendShaderData(cShaderData, manager);
diff --git a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
index fa1cdd0de..3e7028bbd 100644
--- a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
+++ b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
@@ -95,7 +95,7 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer()
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -104,7 +104,7 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer()
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
@@ -237,7 +237,7 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer()
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -258,7 +258,7 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer()
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
diff --git a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
index 91b8f887d..d6aca6219 100644
--- a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
+++ b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
@@ -62,7 +62,7 @@ void benchmarkAlloc()
             items[i] = allocator.allocate< Object<Size> >();
         }
     }
-    foreach (Object<Size>* item, items) {
+    for (Object<Size>* item : qAsConst(items)) {
         allocator.deallocate(item);
     }
 }
@@ -76,7 +76,7 @@ void benchmarkDealloc()
         items[i] = allocator.allocate< Object<Size> >();
     }
     QBENCHMARK_ONCE {
-        foreach (Object<Size>* item, items) {
+        for (Object<Size>* item : qAsConst(items)) {
             allocator.deallocate(item);
         }
     }
diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
index 0813fff91..870a256c9 100644
--- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
@@ -75,7 +75,7 @@ void benchmarkReleaseResources()
     }
 
     QBENCHMARK_ONCE {
-        foreach (auto ptr, resources) {
+        for (auto ptr : qAsConst(resources)) {
             allocator.releaseResource(ptr);
         }
     }
diff --git a/tests/manual/assimp/main.cpp b/tests/manual/assimp/main.cpp
index 5df575e32..307ff87c2 100644
--- a/tests/manual/assimp/main.cpp
+++ b/tests/manual/assimp/main.cpp
@@ -85,8 +85,8 @@ QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString
 QObject *SceneHelper::findComponent(Qt3DCore::QEntity *entity, const QString &componentMetatype)
 {
     Q_ASSERT(entity);
-    Qt3DCore::QComponentVector components = entity->components();
-    Q_FOREACH (Qt3DCore::QComponent *component, components) {
+    const Qt3DCore::QComponentVector components = entity->components();
+    for (Qt3DCore::QComponent *component : components) {
         qDebug() << component->metaObject()->className();
         if (component->metaObject()->className() == componentMetatype) {
             return component;
diff --git a/tests/manual/custom-mesh-cpp-indirect/main.cpp b/tests/manual/custom-mesh-cpp-indirect/main.cpp
index bac4a7227..e967a5375 100644
--- a/tests/manual/custom-mesh-cpp-indirect/main.cpp
+++ b/tests/manual/custom-mesh-cpp-indirect/main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -179,7 +179,7 @@ int main(int argc, char* argv[])
         float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
         int idx = 0;
 
-        Q_FOREACH (const QVector3D &v, vertices) {
+        for (const QVector3D &v : vertices) {
             rawVertexArray[idx++] = v.x();
             rawVertexArray[idx++] = v.y();
             rawVertexArray[idx++] = v.z();
diff --git a/tests/manual/custom-mesh-cpp/main.cpp b/tests/manual/custom-mesh-cpp/main.cpp
index e51321e65..7b70ba624 100644
--- a/tests/manual/custom-mesh-cpp/main.cpp
+++ b/tests/manual/custom-mesh-cpp/main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -158,7 +158,7 @@ int main(int argc, char* argv[])
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
diff --git a/tests/manual/custom-mesh-update-data-cpp/main.cpp b/tests/manual/custom-mesh-update-data-cpp/main.cpp
index 80ee2088d..3d9507049 100644
--- a/tests/manual/custom-mesh-update-data-cpp/main.cpp
+++ b/tests/manual/custom-mesh-update-data-cpp/main.cpp
@@ -167,7 +167,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -176,7 +176,7 @@ int main(int argc, char* argv[])
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
@@ -287,12 +287,12 @@ void TimerObject::timeout()
     QVector3D c2(qFabs(qSin(angle)), qFabs(qCos(angle + M_PI_4)), qFabs(qSin(angle + M_PI_4)));
     QVector3D c3(qFabs(qSin(angle + M_PI_4)), qFabs(qSin(angle)), qFabs(qCos(angle)));
 
-    QVector<QVector3D> colors = QVector<QVector3D>() << c1 << c2 << c3;
+    const QVector<QVector3D> colors = QVector<QVector3D>() << c1 << c2 << c3;
 
     float *rawVertexArray = reinterpret_cast<float *>(updateData.data());
 
     int pos = 6 * sizeof(float); //color offset
-    Q_FOREACH (const QVector3D &v, colors) {
+    for (const QVector3D &v : colors) {
         rawVertexArray[0] = v.x();
         rawVertexArray[1] = v.y();
         rawVertexArray[2] = v.z();
diff --git a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
index 48f8ad3fe..d069d609d 100644
--- a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
@@ -85,13 +85,13 @@ void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera)
 
 void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
+    for (Qt3DRender::QFilterKey *c : qAsConst(criteria))
         m_geometryPassFilter->addMatch(c);
 }
 
 void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
+    for (Qt3DRender::QFilterKey *c : qAsConst(criteria))
         c->setParent(m_finalPassFilter);
 }