summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-25 16:58:50 +0200
committerhjk <hjk@qt.io>2019-07-26 12:59:41 +0000
commita34bf6a23ba4e17fade5d2b1671f7b2c8a7822c3 (patch)
treecd6448b1c758d6fc8937606009d2ff22d055deee
parenta6c85993ba324def14c4e306d940df4d0a47da30 (diff)
downloadqt-creator-a34bf6a23ba4e17fade5d2b1671f7b2c8a7822c3.tar.gz
QmlPuppet: Replace some foreach
Change-Id: I59b4049282564762f75aa5e9a7a0b7eba055db48 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp2
-rw-r--r--share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp2
-rw-r--r--share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp3
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp3
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp2
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 73e360122a..73c8138a43 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 91b77e27a6..8348cbecb0 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 ca4792e7a0..a14a6d627f 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 f546548b41..ad81fbdf6e 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 56e407f62b..3dbb2cb79b 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);