From f4c6bf0179d4a29f869612d99de9e993019c854b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Mon, 22 Aug 2022 17:10:00 +0200
Subject: [PATCH] QmlDesigner: Move QmlVisualNode::states to QmlObjectNode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../qmldesigner/designercore/include/qmlobjectnode.h      | 2 ++
 .../qmldesigner/designercore/include/qmlvisualnode.h      | 3 +--
 .../qmldesigner/designercore/model/qmlobjectnode.cpp      | 7 +++++++
 .../qmldesigner/designercore/model/qmlvisualnode.cpp      | 8 --------
 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 7b1cfbe86e1..3b83420325d 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 af209245479..da925e4f110 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 5e137b06b87..a7a88245d13 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 cc7ab776152..04fee0327c3 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,