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

QmllDesigner: Refactoring to use allSubModelNodesAndThisNode

Browse Source 
Change-Id: Ied8f2e9e10163f46c862edb6ee8e96a58a36bd71
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2014-04-23 13:02:06 +02:00
parent 7f55922a3d
commit 076bea31ba
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -192,14 +192,9 @@ void ComponentView::nodeCreated(const ModelNode &createdNode)
void ComponentView::searchForComponentAndAddToList(const ModelNode &node) void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
{ {
QList<ModelNode> nodeList;
nodeList.append(node);
nodeList.append(node.allSubModelNodes());
bool masterNotAdded = true; bool masterNotAdded = true;
foreach (const ModelNode &node, nodeList) { foreach (const ModelNode &node, node.allSubModelNodesAndThisNode()) {
if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) { if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) {
if (masterNotAdded) { if (masterNotAdded) {
masterNotAdded = true; masterNotAdded = true;

4
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View File

@@ -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) static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QString> &idRenamingHash, AbstractView *view)
{ {
QList<ModelNode> allNodes(modelNode.allSubModelNodes()); foreach (const ModelNode &node, modelNode.allSubModelNodesAndThisNode()) {
allNodes.append(modelNode);
foreach (const ModelNode &node, allNodes) {
if (!node.id().isEmpty()) { if (!node.id().isEmpty()) {
QString newId = node.id(); QString newId = node.id();
QString baseId; QString baseId;