feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Avoid temporary extensive copy

Browse Source 
Change-Id: I8e77ea98e4e3c6086c3dd8a424da6dfd3f95a0fa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2018-01-13 19:35:16 +01:00
parent 59a01d9a1d
commit 85fbd5a366
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -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()

2
src/plugins/modeleditor/modelindexer.cpp
View File

@@ -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);
}

6
src/plugins/modeleditor/pxnodecontroller.cpp
View File

@@ -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;

10
src/plugins/modeleditor/pxnodeutilities.cpp
View File

@@ -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)