diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h index c232997ea33..739eb0b9e61 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h @@ -58,9 +58,6 @@ public: QmlItemNode rootQmlItemNode() const; -protected: - NodeInstance instanceForModelNode(const ModelNode &modelNode); - bool hasInstanceForModelNode(const ModelNode &modelNode); void activateState(const QmlModelState &state); diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index b70f46f955c..4b3480a0ae1 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -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 diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp index 9aab6e9a57e..8adf5fec7ff 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp @@ -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 diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 99fd9678b14..1a8dd6ecc11 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -403,11 +403,8 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode) const QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name) { - QmlModelView *modelView = qobject_cast(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)