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

QmlDesigner: Use the global QmlModelView

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

Change-Id: Iee041d6e1972bd2cd9040f932404feffbe5728ef
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Marco Bubke
2013-07-25 16:53:03 +02:00
parent e9c4965c91
commit e9e0a4dd26
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
View File

@@ -49,7 +49,7 @@ public:
QmlModelNodeFacade();
bool isRootNode() const;
QmlModelView* qmlModelView() const;
static QmlModelView* qmlModelView();
protected:

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

@@ -29,6 +29,7 @@
#include "qmlmodelnodefacade.h"
#include "qmlmodelview.h"
#include <qmldesignerplugin.h>
#include <QDebug>
namespace QmlDesigner {
@@ -62,16 +63,14 @@ bool QmlModelNodeFacade::isValid() const
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)
{
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