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>
 
 

5 files changed, 36 insertions, 36 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);
     }
 }