From 432ed0a72dc462642d716e30f34dbde9be6f69b0 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 31 Aug 2022 10:21:55 +0200
Subject: [PATCH] QmlDesigner: Use new validation approach in curve editor

Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I24aa4023808a42215a6e79c15f962128702ff51c
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
---
 .../curveeditor/curveeditorview.cpp           | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
index 0decde20297..0646e8de73d 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
@@ -144,7 +144,6 @@ void CurveEditorView::variantPropertiesChanged([[maybe_unused]] const QList<Vari
     for (const auto &property : propertyList) {
         if ((property.name() == "frame" || property.name() == "value")
             && property.parentModelNode().type() == "QtQuick.Timeline.Keyframe"
-            && property.parentModelNode().isValid()
             && property.parentModelNode().hasParentProperty()) {
             const ModelNode framesNode = property.parentModelNode().parentProperty().parentModelNode();
             if (QmlTimelineKeyframeGroup::isValidQmlTimelineKeyframeGroup(framesNode))
@@ -166,7 +165,7 @@ void CurveEditorView::bindingPropertiesChanged([[maybe_unused]] const QList<Bind
 void CurveEditorView::propertiesRemoved([[maybe_unused]] const QList<AbstractProperty> &propertyList)
 {
     for (const auto &property : propertyList) {
-        if (property.name() == "keyframes" && property.parentModelNode().isValid()) {
+        if (property.name() == "keyframes") {
             ModelNode parent = property.parentModelNode();
             if (dirtyfiesView(parent))
                 updateKeyframes();
@@ -260,10 +259,7 @@ ModelNode getTargetNode(PropertyTreeItem *item, const QmlTimeline &timeline)
 QmlTimelineKeyframeGroup timelineKeyframeGroup(QmlTimeline &timeline, PropertyTreeItem *item)
 {
     ModelNode node = getTargetNode(item, timeline);
-    if (node.isValid())
-        return timeline.keyframeGroup(node, item->name().toLatin1());
-
-    return QmlTimelineKeyframeGroup();
+    return timeline.keyframeGroup(node, item->name().toLatin1());
 }
 
 void attachEasingCurve(const QmlTimelineKeyframeGroup &group, double frame, const QEasingCurve &curve)
@@ -277,23 +273,21 @@ void attachEasingCurve(const QmlTimelineKeyframeGroup &group, double frame, cons
 
 void commitAuxiliaryData(ModelNode &node, TreeItem *item)
 {
-    if (node.isValid()) {
-        if (item->locked())
-            node.setLocked(true);
-        else
-            node.setLocked(false);
+    if (item->locked())
+        node.setLocked(true);
+    else
+        node.setLocked(false);
 
-        if (item->pinned())
-            node.setAuxiliaryData(pinnedProperty, true);
-        else
-            node.removeAuxiliaryData(pinnedProperty);
+    if (item->pinned())
+        node.setAuxiliaryData(pinnedProperty, true);
+    else
+        node.removeAuxiliaryData(pinnedProperty);
 
-        if (auto *pitem = item->asPropertyItem()) {
-            if (pitem->hasUnified())
-                node.setAuxiliaryData(unifiedProperty, pitem->unifyString());
-            else
-                node.removeAuxiliaryData(unifiedProperty);
-        }
+    if (auto *pitem = item->asPropertyItem()) {
+        if (pitem->hasUnified())
+            node.setAuxiliaryData(unifiedProperty, pitem->unifyString());
+        else
+            node.removeAuxiliaryData(unifiedProperty);
     }
 }