QmlDesigner: Introduce QmlVisualNode and Qml3DNode

We have to support QQuick3DNodes for the timeline and states editor.
QmlVisualNode aggregates the shared properties between QQuickItem and
QQuick3DNodes. Both have states and are visual nodes shown in the
navigator.

Task-number: QDS-1102
Change-Id: Iab8c20921012bb751caeafb1c2ee91c0d8922b2e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

3 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
index 032a133f89..1797ae9bff 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
@@ -238,7 +238,7 @@ void TimelineAnimationForm::populateStateComboBox()
         return;
     QmlObjectNode rootNode = QmlObjectNode(m_animation.view()->rootModelNode());
     if (rootNode.isValid() && rootNode.modelNode().hasId()) {
-        for (const QmlModelState &state : QmlItemNode(rootNode).states().allStates()) {
+        for (const QmlModelState &state : QmlVisualNode(rootNode).states().allStates()) {
             ui->transitionToState
                 ->addItem(state.modelNode().variantProperty("name").value().toString(),
                           QVariant::fromValue<ModelNode>(state.modelNode()));
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
index f75d129983..e308d65772 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
@@ -29,7 +29,7 @@
 
 #include <modelnode.h>
 #include <variantproperty.h>
-#include <qmlitemnode.h>
+#include <qmlvisualnode.h>
 
 #include <utils/qtcassert.h>
 
@@ -152,7 +152,7 @@ void TimelineSettingsModel::resetModel()
     if (timelineView()->isAttached() && timelineView()->rootModelNode().hasId()) {
         addState(ModelNode());
         for (const QmlModelState &state :
-             QmlItemNode(timelineView()->rootModelNode()).states().allStates())
+             QmlVisualNode(timelineView()->rootModelNode()).states().allStates())
             addState(state);
     }
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
index afb04d4258..eb4b270a99 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
@@ -500,7 +500,7 @@ QmlModelState TimelineView::stateForTimeline(const QmlTimeline &timeline)
         return QmlModelState(rootModelNode());
     }
 
-    for (const QmlModelState &state : QmlItemNode(rootModelNode()).states().allStates()) {
+    for (const QmlModelState &state : QmlVisualNode(rootModelNode()).states().allStates()) {
         if (timelineForState(state) == timeline)
             return state;
     }