summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Becher <jochen_becher@gmx.de>2018-01-13 19:35:16 +0100
committerJochen Becher <jochen_becher@gmx.de>2018-01-24 06:00:06 +0000
commit85fbd5a366c835b1af81a67e7408909980e454e1 (patch)
treed1151d12096899a5e5c07c94a0079bf28b5ef723
parent59a01d9a1d42da2676c8647b6c567d359eebb123 (diff)
downloadqt-creator-85fbd5a366c835b1af81a67e7408909980e454e1.tar.gz
ModelEditor: Avoid temporary extensive copy
Change-Id: I8e77ea98e4e3c6086c3dd8a424da6dfd3f95a0fa Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--src/plugins/modeleditor/componentviewcontroller.cpp2
-rw-r--r--src/plugins/modeleditor/modelindexer.cpp2
-rw-r--r--src/plugins/modeleditor/pxnodecontroller.cpp6
-rw-r--r--src/plugins/modeleditor/pxnodeutilities.cpp10
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp
index 52501649cd..c8c0f1b1c3 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<qmt::MRelation> &handle, source->relations()) {
+ for (const qmt::Handle<qmt::MRelation> &handle : source->relations()) {
if (auto dependency = dynamic_cast<qmt::MDependency *>(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 4df25cd54e..aa84b68954 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<qmt::MObject> &child, object->children()) {
+ for (const qmt::Handle<qmt::MObject> &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 bdbadae8a0..c1181fba98 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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto diagram = dynamic_cast<qmt::MDiagram *>(handle.target()))
return diagram;
diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp
index 4deec764cc..7e6c986a50 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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
if (auto childPackage = dynamic_cast<qmt::MPackage *>(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<qmt::MObject> &handle, package->children()) {
+ for (const qmt::Handle<qmt::MObject> &handle : package->children()) {
if (handle.hasTarget()) {
qmt::MObject *target = handle.target();
if (typeid(*target) == typeid(*object)