From d7402bfff332176148c019f46e7fee97180ccb26 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 30 Jul 2013 12:06:03 +0200 Subject: [PATCH] QmlDesigner: Refactor allQmlItemsRecursive Change-Id: If8b98e008e59de1eae87108a3256005fd85981b9 Reviewed-by: Thomas Hartmann --- .../designercore/model/qmlobjectnode.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index fc1709b38ca..99fd9678b14 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -322,20 +322,18 @@ QList QmlObjectNode::allAffectingStatesOperations() cons static QList allQmlItemsRecursive(const QmlItemNode &qmlItemNode) { - QList returnList; + QList qmlItemNodeList; if (qmlItemNode.isValid()) { - returnList.append(qmlItemNode); - QList 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 QmlObjectNode::allDefinedStates() const