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

QmlDesigner: Remove instanceForModelNode functions

Browse Source 
Use directly the NodeInstanceView

Change-Id: I8e4da4fa9e130fe62db178df6a0b60e9bda01a86
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-29 17:19:39 +02:00
parent 9343583f6a
commit b756be03ae
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/include/qmlmodelview.h
View File

@@ -58,9 +58,6 @@ public:
QmlItemNode rootQmlItemNode() const;
protected:
NodeInstance instanceForModelNode(const ModelNode &modelNode);
bool hasInstanceForModelNode(const ModelNode &modelNode);
void activateState(const QmlModelState &state);

6
src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp
View File

@@ -70,7 +70,11 @@ QmlModelView* QmlModelNodeFacade::qmlModelView()
bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode)
{
return modelNode.isValid() && qmlModelView() && qmlModelView()->nodeInstanceView() && qmlModelView()->hasInstanceForModelNode(modelNode) && qmlModelView()->instanceForModelNode(modelNode).isValid();
return modelNode.isValid()
&& qmlModelView()
&& qmlModelView()->nodeInstanceView()
&& qmlModelView()->nodeInstanceView()->hasInstanceForNode(modelNode)
&& qmlModelView()->nodeInstanceView()->instanceForNode(modelNode).isValid();
}
bool QmlModelNodeFacade::isRootNode() const

10
src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
View File

@@ -85,14 +85,4 @@ QmlItemNode QmlModelView::rootQmlItemNode() const
return QmlItemNode(rootModelNode());
}
NodeInstance QmlModelView::instanceForModelNode(const ModelNode &modelNode)
{
return nodeInstanceView()->instanceForNode(modelNode);
}
bool QmlModelView::hasInstanceForModelNode(const ModelNode &modelNode)
{
return nodeInstanceView() && nodeInstanceView()->hasInstanceForNode(modelNode);
}
} //QmlDesigner

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

@@ -403,11 +403,8 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode) const
QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name)
{
QmlModelView *modelView = qobject_cast<QmlModelView*>(modelNode.view());
if (!modelView)
throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
Q_ASSERT(modelView->hasInstanceForModelNode(modelNode));
return modelView->instanceForModelNode(modelNode).property(name);
Q_ASSERT(modelNode.view()->nodeInstanceView()->hasInstanceForNode(modelNode));
return modelNode.view()->nodeInstanceView()->instanceForNode(modelNode).property(name);
}
QString QmlObjectNode::generateTranslatableText(const QString &text)