summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-07-29 17:20:47 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-07-31 13:12:54 +0200
commit237d173160ca3f95d36a9e16784058edbdfe84fa (patch)
tree77a57c430943406db48d6121712f6dd60c336a0c /src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
parentb756be03aef8674d2b3545ccee8b56545c3be6ee (diff)
downloadqt-creator-237d173160ca3f95d36a9e16784058edbdfe84fa.tar.gz
QmlDesigner: Rename instanceForNode in instanceForModelNode
Change-Id: I182d5b557f5770816059897e746709d054ecac51 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp')
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 1a8dd6ecc1..57f832c22f 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -404,7 +404,7 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode) const
QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name)
{
Q_ASSERT(modelNode.view()->nodeInstanceView()->hasInstanceForNode(modelNode));
- return modelNode.view()->nodeInstanceView()->instanceForNode(modelNode).property(name);
+ return modelNode.view()->nodeInstanceView()->instanceForModelNode(modelNode).property(name);
}
QString QmlObjectNode::generateTranslatableText(const QString &text)
@@ -428,7 +428,7 @@ bool QmlObjectNode::instanceHasBinding(const PropertyName &name) const
NodeInstance QmlObjectNode::nodeInstance() const
{
- return qmlModelView()->nodeInstanceView()->instanceForNode(modelNode());
+ return qmlModelView()->nodeInstanceView()->instanceForModelNode(modelNode());
}
QmlObjectNode QmlObjectNode::nodeForInstance(const NodeInstance &instance) const