diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-08-22 17:10:00 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-08-23 08:00:28 +0000 |
commit | f4c6bf0179d4a29f869612d99de9e993019c854b (patch) | |
tree | 08b913c0d9d8cee2aea67c00546012ee9e53f4a7 | |
parent | bddac59a95bd9ca1333ac29a6e6b62d8bac66827 (diff) |
QmlDesigner: Move QmlVisualNode::states to QmlObjectNode
This is required for StateGroup support.
Change-Id: I25d8f94c2a0fa9140ce8af3032bc92a7b858b9d8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h index 7b1cfbe86e..3b83420325 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h @@ -131,6 +131,8 @@ public: QList<QmlModelState> allDefinedStates() const; QList<QmlModelStateOperation> allInvalidStateOperations() const; + QmlModelStateGroup states() const; + protected: NodeInstance nodeInstance() const; QmlObjectNode nodeForInstance(const NodeInstance &instance) const; diff --git a/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h b/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h index af20924547..da925e4f11 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h @@ -71,7 +71,6 @@ public: static bool isValidQmlVisualNode(const ModelNode &modelNode); bool isRootNode() const; - QmlModelStateGroup states() const; QList<QmlVisualNode> children() const; QList<QmlObjectNode> resources() const; QList<QmlObjectNode> allDirectSubNodes() const; @@ -121,7 +120,7 @@ private: class QMLDESIGNERCORE_EXPORT QmlModelStateGroup { - friend class QmlVisualNode; + friend class QmlObjectNode; friend class StatesEditorView; public: diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 5e137b06b8..a7a88245d1 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -582,6 +582,13 @@ QList<QmlModelStateOperation> QmlObjectNode::allInvalidStateOperations() const return result; } +QmlModelStateGroup QmlObjectNode::states() const +{ + if (isValid()) + return QmlModelStateGroup(modelNode()); + else + return QmlModelStateGroup(); +} /*! Removes a variant property of the object specified by \a name from the diff --git a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp index cc7ab77615..04fee0327c 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp @@ -191,14 +191,6 @@ void QmlVisualNode::initializePosition(const QmlVisualNode::Position &position) } } -QmlModelStateGroup QmlVisualNode::states() const -{ - if (isValid()) - return QmlModelStateGroup(modelNode()); - else - return QmlModelStateGroup(); -} - QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view, const ItemLibraryEntry &itemLibraryEntry, const Position &position, |