From 34e4a8ef6d20e829a322bfef1d09136a37fecfd2 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 7 Dec 2018 12:01:42 +0100
Subject: Cleanup Widgets examples - foreach

Cleanup the Widgets examples - replace foreach with range-based for loop
in the remaining directories

Change-Id: I321e6c0f414401a1ae4fb65762b97d894b725afa
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
---
 examples/widgets/animation/stickman/animation.cpp         | 8 +++-----
 examples/widgets/animation/sub-attaq/animationmanager.cpp | 4 ++--
 examples/widgets/animation/sub-attaq/bomb.cpp             | 4 +++-
 examples/widgets/animation/sub-attaq/graphicsscene.cpp    | 6 +++---
 examples/widgets/animation/sub-attaq/torpedo.cpp          | 4 +++-
 5 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'examples/widgets/animation')

diff --git a/examples/widgets/animation/stickman/animation.cpp b/examples/widgets/animation/stickman/animation.cpp
index 94a92749bc..5c2d1682af 100644
--- a/examples/widgets/animation/stickman/animation.cpp
+++ b/examples/widgets/animation/stickman/animation.cpp
@@ -159,18 +159,16 @@ void Animation::save(QIODevice *device) const
     QDataStream stream(device);
     stream << m_name;
     stream << m_frames.size();
-    foreach (Frame *frame, m_frames) {
+    for (const Frame *frame : qAsConst(m_frames)) {
         stream << frame->nodeCount();
-        for (int i=0; i<frame->nodeCount(); ++i)
+        for (int i = 0; i < frame->nodeCount(); ++i)
             stream << frame->nodePos(i);
     }
 }
 
 void Animation::load(QIODevice *device)
 {
-    if (!m_frames.isEmpty())
-        qDeleteAll(m_frames);
-
+    qDeleteAll(m_frames);
     m_frames.clear();
 
     QDataStream stream(device);
diff --git a/examples/widgets/animation/sub-attaq/animationmanager.cpp b/examples/widgets/animation/sub-attaq/animationmanager.cpp
index e3dc27f37f..a611641613 100644
--- a/examples/widgets/animation/sub-attaq/animationmanager.cpp
+++ b/examples/widgets/animation/sub-attaq/animationmanager.cpp
@@ -93,14 +93,14 @@ void AnimationManager::unregisterAllAnimations()
 
 void AnimationManager::pauseAll()
 {
-    foreach (QAbstractAnimation* animation, animations) {
+    for (QAbstractAnimation *animation : qAsConst(animations)) {
         if (animation->state() == QAbstractAnimation::Running)
             animation->pause();
     }
 }
 void AnimationManager::resumeAll()
 {
-    foreach (QAbstractAnimation* animation, animations) {
+    for (QAbstractAnimation *animation : qAsConst(animations)) {
         if (animation->state() == QAbstractAnimation::Paused)
             animation->resume();
     }
diff --git a/examples/widgets/animation/sub-attaq/bomb.cpp b/examples/widgets/animation/sub-attaq/bomb.cpp
index 76e4575293..2b865137dd 100644
--- a/examples/widgets/animation/sub-attaq/bomb.cpp
+++ b/examples/widgets/animation/sub-attaq/bomb.cpp
@@ -112,7 +112,9 @@ void Bomb::launch(Bomb::Direction direction)
 
 void Bomb::onAnimationLaunchValueChanged(const QVariant &)
 {
-    foreach (QGraphicsItem * item , collidingItems(Qt::IntersectsItemBoundingRect)) {
+    const QList<QGraphicsItem *> colItems =
+            collidingItems(Qt::IntersectsItemBoundingRect);
+    for (QGraphicsItem *item : colItems) {
         if (item->type() == SubMarine::Type) {
             SubMarine *s = static_cast<SubMarine *>(item);
             destroy();
diff --git a/examples/widgets/animation/sub-attaq/graphicsscene.cpp b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
index 3205cdc54d..8f0dfc1357 100644
--- a/examples/widgets/animation/sub-attaq/graphicsscene.cpp
+++ b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
@@ -265,17 +265,17 @@ void GraphicsScene::onSubMarineExecutionFinished()
 
 void GraphicsScene::clearScene()
 {
-    foreach (SubMarine *sub, submarines) {
+    for (SubMarine *sub : qAsConst(submarines)) {
         sub->destroy();
         sub->deleteLater();
     }
 
-    foreach (Torpedo *torpedo, torpedos) {
+    for (Torpedo *torpedo : qAsConst(torpedos)) {
         torpedo->destroy();
         torpedo->deleteLater();
     }
 
-    foreach (Bomb *bomb, bombs) {
+    for (Bomb *bomb : qAsConst(bombs)) {
         bomb->destroy();
         bomb->deleteLater();
     }
diff --git a/examples/widgets/animation/sub-attaq/torpedo.cpp b/examples/widgets/animation/sub-attaq/torpedo.cpp
index 5f8ef2f2b8..92a3833452 100644
--- a/examples/widgets/animation/sub-attaq/torpedo.cpp
+++ b/examples/widgets/animation/sub-attaq/torpedo.cpp
@@ -111,7 +111,9 @@ void Torpedo::setCurrentSpeed(int speed)
 
 void Torpedo::onAnimationLaunchValueChanged(const QVariant &)
 {
-    foreach (QGraphicsItem *item , collidingItems(Qt::IntersectsItemBoundingRect)) {
+    const QList<QGraphicsItem *> colItems =
+            collidingItems(Qt::IntersectsItemBoundingRect);
+    for (QGraphicsItem *item : colItems) {
         if (Boat *b = qgraphicsitem_cast<Boat*>(item))
             b->destroy();
     }
-- 
cgit v1.2.3