Skip to content
Snippets Groups Projects
Commit e9e0a4dd authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Use the global QmlModelView


We should change that QmlModelView architecture anyway. It is not really
fitting. Maybe attach one to the model.

Change-Id: Iee041d6e1972bd2cd9040f932404feffbe5728ef
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent e9c4965c
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
QmlModelNodeFacade(); QmlModelNodeFacade();
bool isRootNode() const; bool isRootNode() const;
QmlModelView* qmlModelView() const; static QmlModelView* qmlModelView();
protected: protected:
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "qmlmodelnodefacade.h" #include "qmlmodelnodefacade.h"
#include "qmlmodelview.h" #include "qmlmodelview.h"
#include <qmldesignerplugin.h>
#include <QDebug> #include <QDebug>
namespace QmlDesigner { namespace QmlDesigner {
...@@ -62,16 +63,14 @@ bool QmlModelNodeFacade::isValid() const ...@@ -62,16 +63,14 @@ bool QmlModelNodeFacade::isValid() const
return isValidQmlModelNodeFacade(m_modelNode); return isValidQmlModelNodeFacade(m_modelNode);
} }
QmlModelView* QmlModelNodeFacade::qmlModelView() const QmlModelView* QmlModelNodeFacade::qmlModelView()
{ {
return modelNode().view()->toQmlModelView(); return QmlDesignerPlugin::instance()->viewManager().qmlModelView();
} }
bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode) bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode)
{ {
QmlModelView * qmlModelView = modelNode.view()->toQmlModelView(); return modelNode.isValid() && qmlModelView() && qmlModelView()->nodeInstanceView() && qmlModelView()->hasInstanceForModelNode(modelNode) && qmlModelView()->instanceForModelNode(modelNode).isValid();
return modelNode.isValid() && qmlModelView && qmlModelView->nodeInstanceView() && qmlModelView->hasInstanceForModelNode(modelNode) && qmlModelView->instanceForModelNode(modelNode).isValid();
} }
bool QmlModelNodeFacade::isRootNode() const bool QmlModelNodeFacade::isRootNode() const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment