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

QmlDesigner: Add static valid functions for the qml objects

Browse Source 
Change-Id: Ied3ec55580471893c8899946455ce2b5198c6f17
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2013-07-18 18:04:18 +02:00
parent 56de157497
commit cc75d77c80
6 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
View File

@@ -51,6 +51,7 @@ public:
QmlItemNode() : QmlObjectNode() {}
QmlItemNode(const ModelNode &modelNode) : QmlObjectNode(modelNode) {}
bool isValid() const;
static bool isValidQmlItemNode(const ModelNode &modelNode);
bool isRootNode() const;
static bool isItemOrWindow(const ModelNode &modelNode);

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

@@ -43,6 +43,7 @@ public:
operator ModelNode() const;
ModelNode modelNode();
const ModelNode modelNode() const;
static bool isValidQmlModelNodeFacade(const ModelNode &modelNode);
virtual bool isValid() const;
virtual ~QmlModelNodeFacade();
QmlModelNodeFacade();
@@ -50,6 +51,7 @@ public:
bool isRootNode() const;
QmlModelView* qmlModelView() const;
protected:
QmlModelNodeFacade(const ModelNode &modelNode);

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

@@ -48,6 +48,9 @@ public:
QmlObjectNode();
QmlObjectNode(const ModelNode &modelNode);
static bool isValidQmlObjectNode(const ModelNode &modelNode);
bool isValid() const;
bool hasNodeParent() const;
bool hasInstanceParent() const;
bool hasInstanceParentItem() const;

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

@@ -50,7 +50,12 @@ bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode)
bool QmlItemNode::isValid() const
{
return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && isItemOrWindow(modelNode());
return isValidQmlItemNode(modelNode());
}
bool QmlItemNode::isValidQmlItemNode(const ModelNode &modelNode)
{
return isValidQmlObjectNode(modelNode) && modelNode.metaInfo().isValid() && isItemOrWindow(modelNode);
}
bool QmlItemNode::isRootNode() const

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

@@ -59,7 +59,7 @@ const ModelNode QmlModelNodeFacade::modelNode() const
bool QmlModelNodeFacade::isValid() const
{
return modelNode().isValid() && qmlModelView() && qmlModelView()->nodeInstanceView() && qmlModelView()->hasInstanceForModelNode(modelNode()) && qmlModelView()->instanceForModelNode(modelNode()).isValid();
return isValidQmlModelNodeFacade(m_modelNode);
}
QmlModelView* QmlModelNodeFacade::qmlModelView() const
@@ -67,6 +67,13 @@ QmlModelView* QmlModelNodeFacade::qmlModelView() const
return modelNode().view()->toQmlModelView();
}
bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode)
{
QmlModelView * qmlModelView = modelNode.view()->toQmlModelView();
return modelNode.isValid() && qmlModelView && qmlModelView->nodeInstanceView() && qmlModelView->hasInstanceForModelNode(modelNode) && qmlModelView->instanceForModelNode(modelNode).isValid();
}
bool QmlModelNodeFacade::isRootNode() const
{
return modelNode().isRootNode();

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

@@ -458,6 +458,17 @@ QmlObjectNode::QmlObjectNode(const ModelNode &modelNode)
: QmlModelNodeFacade(modelNode)
{
}
bool QmlObjectNode::isValidQmlObjectNode(const ModelNode &modelNode)
{
return isValidQmlModelNodeFacade(modelNode);
}
bool QmlObjectNode::isValid() const
{
return isValidQmlObjectNode(modelNode());
}
bool QmlObjectNode::hasNodeParent() const
{
return modelNode().hasParentProperty();