From 85fbd5a366c835b1af81a67e7408909980e454e1 Mon Sep 17 00:00:00 2001 From: Jochen Becher Date: Sat, 13 Jan 2018 19:35:16 +0100 Subject: [PATCH] ModelEditor: Avoid temporary extensive copy Change-Id: I8e77ea98e4e3c6086c3dd8a424da6dfd3f95a0fa Reviewed-by: Tobias Hunger --- src/plugins/modeleditor/componentviewcontroller.cpp | 2 +- src/plugins/modeleditor/modelindexer.cpp | 2 +- src/plugins/modeleditor/pxnodecontroller.cpp | 6 +++--- src/plugins/modeleditor/pxnodeutilities.cpp | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp index 52501649cd8..c8c0f1b1c30 100644 --- a/src/plugins/modeleditor/componentviewcontroller.cpp +++ b/src/plugins/modeleditor/componentviewcontroller.cpp @@ -344,7 +344,7 @@ bool UpdateIncludeDependenciesVisitor::haveDependency(const qmt::MObject *source aToB = qmt::MDependency::BToA; bToA = qmt::MDependency::AToB; } - foreach (const qmt::Handle &handle, source->relations()) { + for (const qmt::Handle &handle : source->relations()) { if (auto dependency = dynamic_cast(handle.target())) { if (dependency->source() == source->uid() && dependency->target() == target->uid() diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 4df25cd54ed..aa84b689548 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -215,7 +215,7 @@ ModelIndexer::DiagramsCollectorVisitor::DiagramsCollectorVisitor(IndexedModel *i void ModelIndexer::DiagramsCollectorVisitor::visitMObject(const qmt::MObject *object) { - foreach (const qmt::Handle &child, object->children()) { + for (const qmt::Handle &child : object->children()) { if (child.hasTarget()) child.target()->accept(this); } diff --git a/src/plugins/modeleditor/pxnodecontroller.cpp b/src/plugins/modeleditor/pxnodecontroller.cpp index bdbadae8a07..c1181fba983 100644 --- a/src/plugins/modeleditor/pxnodecontroller.cpp +++ b/src/plugins/modeleditor/pxnodecontroller.cpp @@ -205,7 +205,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore qmt::MPackage *package = roots.takeFirst(); // append all sub-packages of the same level as next root packages - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) roots.append(childPackage); @@ -219,7 +219,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore QString relativeSearchId = qmt::NameController::calcElementNameSearchId( relativeElements.at(relativeIndex)); found = false; - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) { if (qmt::NameController::calcElementNameSearchId(childPackage->name()) == relativeSearchId) { @@ -241,7 +241,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore if (diagram) return diagram; // find first diagram within deepest package - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto diagram = dynamic_cast(handle.target())) return diagram; diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp index 4deec764ccb..7e6c986a509 100644 --- a/src/plugins/modeleditor/pxnodeutilities.cpp +++ b/src/plugins/modeleditor/pxnodeutilities.cpp @@ -120,7 +120,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath( roots.takeFirst(); // append all sub-packages of the same level as next root packages - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) { // only accept root packages in the same path as the suggested parent package @@ -139,7 +139,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath( QString relativeSearchId = qmt::NameController::calcElementNameSearchId( relativeElements.at(relativeIndex)); found = false; - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) { if (qmt::NameController::calcElementNameSearchId(childPackage->name()) == relativeSearchId) { @@ -198,7 +198,7 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement qmt::MPackage *package = roots.takeFirst(); // append all sub-packages of the same level as next root packages - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) roots.append(childPackage); @@ -212,7 +212,7 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement QString relativeSearchId = qmt::NameController::calcElementNameSearchId( relativeElements.at(relativeIndex)); found = false; - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { if (auto childPackage = dynamic_cast(handle.target())) { if (qmt::NameController::calcElementNameSearchId(childPackage->name()) == relativeSearchId) { @@ -230,7 +230,7 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement QMT_CHECK(relativeIndex >= relativeElements.size()); // chain was found so check for given object within deepest package QString objectSearchId = qmt::NameController::calcElementNameSearchId(object->name()); - foreach (const qmt::Handle &handle, package->children()) { + for (const qmt::Handle &handle : package->children()) { if (handle.hasTarget()) { qmt::MObject *target = handle.target(); if (typeid(*target) == typeid(*object)