summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-07-30 12:06:03 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-07-31 11:15:24 +0200
commitd7402bfff332176148c019f46e7fee97180ccb26 (patch)
tree8425333c60afebbba1d97951c0a764a47588fc45 /src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
parent877f9081cc7fd288492479af7b3a6abb5f2bb00f (diff)
downloadqt-creator-d7402bfff332176148c019f46e7fee97180ccb26.tar.gz
QmlDesigner: Refactor allQmlItemsRecursive
Change-Id: If8b98e008e59de1eae87108a3256005fd85981b9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp')
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index fc1709b38c..99fd9678b1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -322,20 +322,18 @@ QList<QmlModelStateOperation> QmlObjectNode::allAffectingStatesOperations() cons
static QList<QmlItemNode> allQmlItemsRecursive(const QmlItemNode &qmlItemNode)
{
- QList<QmlItemNode> returnList;
+ QList<QmlItemNode> qmlItemNodeList;
if (qmlItemNode.isValid()) {
- returnList.append(qmlItemNode);
- QList<QmlItemNode> allChildNodes;
- foreach (const ModelNode &node, qmlItemNode.modelNode().allDirectSubModelNodes()) {
- if (QmlItemNode::isValidQmlItemNode(node))
- allChildNodes.append(node);
- }
- foreach (const QmlItemNode &node, allChildNodes) {
- returnList.append(allQmlItemsRecursive(node));
+ qmlItemNodeList.append(qmlItemNode);
+
+ foreach (const ModelNode &modelNode, qmlItemNode.modelNode().allDirectSubModelNodes()) {
+ if (QmlItemNode::isValidQmlItemNode(modelNode))
+ qmlItemNodeList.append(allQmlItemsRecursive(modelNode));
}
}
- return returnList;
+
+ return qmlItemNodeList;
}
QList<QmlModelState> QmlObjectNode::allDefinedStates() const