From 97007d0590ae3b6416bd1b25746d1b05afbefe25 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 31 Jul 2013 18:11:27 +0200
Subject: [PATCH] QmlDesigner: Use defaultNodeAbstractProperty
Change-Id: Ifa16795d6cca1256b86b69ab9f7da3e0644aec48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../components/componentcore/modelnodeoperations.cpp | 2 +-
.../qmldesigner/components/formeditor/movemanipulator.cpp | 2 +-
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index 565f22813f6..d006c196d27 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -114,7 +114,7 @@ static inline void reparentTo(const ModelNode &node, const QmlItemNode &parent)
NodeAbstractProperty parentProperty;
if (parent.hasDefaultPropertyName())
- parentProperty = parent.nodeAbstractProperty(parent.defaultPropertyName());
+ parentProperty = parent.defaultNodeAbstractProperty();
else
parentProperty = parent.nodeAbstractProperty("data");
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index 5ed78b6edd8..4ac274afc74 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -349,7 +349,7 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent)
QmlItemNode parentItemNode(newParent->qmlItemNode());
if (parentItemNode.isValid()) {
if (parentItemNode.hasDefaultPropertyName())
- parentProperty = parentItemNode.nodeAbstractProperty(parentItemNode.defaultPropertyName());
+ parentProperty = parentItemNode.defaultNodeAbstractProperty();
else
parentProperty = parentItemNode.nodeAbstractProperty("data");
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 8680c9c77e2..1746e956c70 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -530,7 +530,7 @@ PropertyName QmlObjectNode::defaultPropertyName() const
void QmlObjectNode::setParent(QmlObjectNode newParent)
{
if (newParent.hasDefaultPropertyName())
- newParent.modelNode().nodeAbstractProperty(newParent.defaultPropertyName()).reparentHere(modelNode());
+ newParent.modelNode().defaultNodeAbstractProperty().reparentHere(modelNode());
}
QmlItemNode QmlObjectNode::toQmlItemNode() const
--
GitLab