From a599ea57efbd14d2c8612bb727f39cfa0775a89c Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 23 Apr 2014 16:22:02 +0200 Subject: [PATCH] QmlDesigner: Refactor clear position code in NavigatorTreeModel Change-Id: Ib2866296c03db0ab8866a3b99761ef83c5000884 Reviewed-by: Marco Bubke --- .../components/navigator/navigatortreemodel.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index f22549ce0db..1b7c99600fd 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -490,6 +490,15 @@ void NavigatorTreeModel::removeSubTree(const ModelNode &node) } +static void removePosition(const ModelNode &node) +{ + ModelNode modelNode = node; + if (modelNode.hasProperty("x")) + modelNode.removeProperty("x"); + if (modelNode.hasProperty("y")) + modelNode.removeProperty("y"); +} + void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList &modelNodes, int targetIndex) { try { @@ -529,12 +538,8 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentPropert } if (parentProperty.isDefaultProperty() && parentProperty.parentModelNode().metaInfo().isLayoutable()) { - ModelNode currentNode = node; - if (currentNode.hasProperty("x")) - currentNode.removeProperty("x"); - if (currentNode.hasProperty("y")) - currentNode.removeProperty("y"); - parentProperty.reparentHere(currentNode); + removePosition(node); + parentProperty.reparentHere(node); } else { if (QmlItemNode(node).isValid()) { QPointF scenePos = QmlItemNode(node).instanceScenePosition();