From 076bea31baec66402d2b87ebd0df0aaaf894f07e Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 23 Apr 2014 13:02:06 +0200
Subject: [PATCH] QmllDesigner: Refactoring to use allSubModelNodesAndThisNode

Change-Id: Ied8f2e9e10163f46c862edb6ee8e96a58a36bd71
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../qmldesigner/components/integration/componentview.cpp   | 7 +------
 src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index f13559daf37..96b9fbca261 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -192,14 +192,9 @@ void ComponentView::nodeCreated(const ModelNode &createdNode)
 
 void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
 {
-    QList<ModelNode> nodeList;
-    nodeList.append(node);
-    nodeList.append(node.allSubModelNodes());
-
-
     bool masterNotAdded = true;
 
-    foreach (const ModelNode &node, nodeList) {
+    foreach (const ModelNode &node, node.allSubModelNodesAndThisNode()) {
         if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) {
             if (masterNotAdded) {
                 masterNotAdded = true;
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index 6fa0110b2b6..ea0c390ec8f 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -97,9 +97,7 @@ static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int *
 
 static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QString> &idRenamingHash, AbstractView *view)
 {
-    QList<ModelNode> allNodes(modelNode.allSubModelNodes());
-    allNodes.append(modelNode);
-    foreach (const ModelNode &node, allNodes) {
+    foreach (const ModelNode &node, modelNode.allSubModelNodesAndThisNode()) {
         if (!node.id().isEmpty()) {
             QString newId = node.id();
             QString baseId;