feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use defaultNodeAbstractProperty

Browse Source 
Change-Id: Ifa16795d6cca1256b86b69ab9f7da3e0644aec48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-31 18:11:27 +02:00
parent f8a2698bcd
commit 97007d0590
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -114,7 +114,7 @@ static inline void reparentTo(const ModelNode &node, const QmlItemNode &parent)
NodeAbstractProperty parentProperty; NodeAbstractProperty parentProperty;
if (parent.hasDefaultPropertyName()) if (parent.hasDefaultPropertyName())
parentProperty = parent.nodeAbstractProperty(parent.defaultPropertyName()); parentProperty = parent.defaultNodeAbstractProperty();
else else
parentProperty = parent.nodeAbstractProperty("data"); parentProperty = parent.nodeAbstractProperty("data");

2
src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
View File

@@ -349,7 +349,7 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent)
QmlItemNode parentItemNode(newParent->qmlItemNode()); QmlItemNode parentItemNode(newParent->qmlItemNode());
if (parentItemNode.isValid()) { if (parentItemNode.isValid()) {
if (parentItemNode.hasDefaultPropertyName()) if (parentItemNode.hasDefaultPropertyName())
parentProperty = parentItemNode.nodeAbstractProperty(parentItemNode.defaultPropertyName()); parentProperty = parentItemNode.defaultNodeAbstractProperty();
else else
parentProperty = parentItemNode.nodeAbstractProperty("data"); parentProperty = parentItemNode.nodeAbstractProperty("data");

2
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -530,7 +530,7 @@ PropertyName QmlObjectNode::defaultPropertyName() const
void QmlObjectNode::setParent(QmlObjectNode newParent) void QmlObjectNode::setParent(QmlObjectNode newParent)
{ {
if (newParent.hasDefaultPropertyName()) if (newParent.hasDefaultPropertyName())
newParent.modelNode().nodeAbstractProperty(newParent.defaultPropertyName()).reparentHere(modelNode()); newParent.modelNode().defaultNodeAbstractProperty().reparentHere(modelNode());
} }
QmlItemNode QmlObjectNode::toQmlItemNode() const QmlItemNode QmlObjectNode::toQmlItemNode() const