From a34bf6a23ba4e17fade5d2b1671f7b2c8a7822c3 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 25 Jul 2019 16:58:50 +0200
Subject: [PATCH] QmlPuppet: Replace some foreach

Change-Id: I59b4049282564762f75aa5e9a7a0b7eba055db48
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp  | 2 +-
 share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp     | 2 +-
 .../qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp        | 3 +--
 .../qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp   | 3 ++-
 .../qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
index 73e360122ae..73c8138a436 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
@@ -62,7 +62,7 @@ quint32 ValuesChangedCommand::keyNumber() const
 
 void ValuesChangedCommand::removeSharedMemorys(const QVector<qint32> &keyNumberVector)
 {
-    foreach (qint32 keyNumber, keyNumberVector) {
+    for (qint32 keyNumber : keyNumberVector) {
         SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber);
         delete sharedMemory;
     }
diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
index 91b77e27a6e..8348cbecb0c 100644
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
@@ -79,7 +79,7 @@ void ImageContainer::setImage(const QImage &image)
 
 void ImageContainer::removeSharedMemorys(const QVector<qint32> &keyNumberVector)
 {
-    foreach (qint32 keyNumber, keyNumberVector) {
+    for (qint32 keyNumber : keyNumberVector) {
         SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber);
         delete sharedMemory;
     }
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
index ca4792e7a0f..a14a6d627f0 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
@@ -303,9 +303,8 @@ void NodeInstanceClientProxy::readDataStream()
             break;
     }
 
-    foreach (const QVariant &command, commandList) {
+    for (const QVariant &command : qAsConst(commandList))
         dispatchCommand(command);
-    }
 }
 
 void NodeInstanceClientProxy::sendPuppetAliveCommand()
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
index f546548b41e..ad81fbdf6eb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
@@ -72,7 +72,8 @@ void ComponentNodeInstance::setNodeSource(const QString &source)
     setId(id());
 
     if (component()->isError()) {
-        foreach (const QQmlError &error, component()->errors())
+        const QList<QQmlError> errors = component()->errors();
+        for (const QQmlError &error : errors)
             qWarning() << error;
     }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 56e407f62bd..3dbb2cb79b8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -189,7 +189,7 @@ QList<ServerNodeInstance> NodeInstanceServer::createInstances(const QVector<Inst
 {
     Q_ASSERT(declarativeView() || quickView());
     QList<ServerNodeInstance> instanceList;
-    foreach (const InstanceContainer &instanceContainer, containerVector) {
+    for (const InstanceContainer &instanceContainer : containerVector) {
         ServerNodeInstance instance;
         if (instanceContainer.nodeSourceType() == InstanceContainer::ComponentSource) {
             instance = ServerNodeInstance::create(this, instanceContainer, ServerNodeInstance::WrapAsComponent);