diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2013-07-31 18:11:27 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2013-08-05 15:53:52 +0200 |
| commit | 97007d0590ae3b6416bd1b25746d1b05afbefe25 (patch) | |
| tree | e1d002b88e8ab81bc45371da8776937202e72a2e | |
| parent | f8a2698bcd26ecedc601b2f4be4d72317b36627e (diff) | |
| download | qt-creator-97007d0590ae3b6416bd1b25746d1b05afbefe25.tar.gz | |
QmlDesigner: Use defaultNodeAbstractProperty
Change-Id: Ifa16795d6cca1256b86b69ab9f7da3e0644aec48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
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 565f22813f..d006c196d2 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 5ed78b6edd..4ac274afc7 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 8680c9c77e..1746e956c7 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 |