Commit 237d1731 authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Rename instanceForNode in instanceForModelNode

Change-Id: I182d5b557f5770816059897e746709d054ecac51
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent b756be03
......@@ -122,7 +122,7 @@ public:
void actualStateChanged(const ModelNode &node);
QList<NodeInstance> instances() const;
NodeInstance instanceForNode(const ModelNode &node) const ;
NodeInstance instanceForModelNode(const ModelNode &node) const ;
bool hasInstanceForNode(const ModelNode &node) const;
NodeInstance instanceForId(qint32 id);
......
......@@ -74,7 +74,7 @@ bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode)
&& qmlModelView()
&& qmlModelView()->nodeInstanceView()
&& qmlModelView()->nodeInstanceView()->hasInstanceForNode(modelNode)
&& qmlModelView()->nodeInstanceView()->instanceForNode(modelNode).isValid();
&& qmlModelView()->nodeInstanceView()->instanceForModelNode(modelNode).isValid();
}
bool QmlModelNodeFacade::isRootNode() const
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment