From 28b87ba4f4b84a89171527cd57c8c5cc7ed27aeb Mon Sep 17 00:00:00 2001
From: Knud Dollereder <knud.dollereder@qt.io>
Date: Wed, 6 Oct 2021 17:17:10 +0200
Subject: [PATCH] Fix check if a key is supposed for deletion

Moved the function into timelineutils.h in order to be able to
use it from other places as well.

Change-Id: If5fa094abb6ae52d7922bc9bbcb96b482ece7ac0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 .../timelineeditor/timelinegraphicsscene.cpp          |  9 ++-------
 .../components/timelineeditor/timelineutils.h         |  5 +++++
 .../transitioneditorgraphicsscene.cpp                 | 11 ++---------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp
index b3150e1e832..ad2dfd88f68 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp
@@ -70,11 +70,6 @@
 
 namespace QmlDesigner {
 
-static bool isDeleteKey(int key)
-{
-    return (key == Qt::Key_Backspace) | (key == Qt::Key_Delete);
-}
-
 QList<QmlTimelineKeyframeGroup> allTimelineFrames(const QmlTimeline &timeline)
 {
     QList<QmlTimelineKeyframeGroup> returnList;
@@ -671,7 +666,7 @@ void TimelineGraphicsScene::keyReleaseEvent(QKeyEvent *keyEvent)
         return;
     }
 
-    if (isDeleteKey(keyEvent->key()))
+    if (TimelineUtils::isDeleteKey(keyEvent->key()))
         handleKeyframeDeletion();
 
     QGraphicsScene::keyReleaseEvent(keyEvent);
@@ -835,7 +830,7 @@ bool TimelineGraphicsScene::event(QEvent *event)
 {
     switch (event->type()) {
     case QEvent::ShortcutOverride:
-        if (isDeleteKey(static_cast<QKeyEvent *>(event)->key())) {
+        if (TimelineUtils::isDeleteKey(static_cast<QKeyEvent *>(event)->key())) {
             QGraphicsScene::keyPressEvent(static_cast<QKeyEvent *>(event));
             event->accept();
             return true;
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineutils.h b/src/plugins/qmldesigner/components/timelineeditor/timelineutils.h
index ec0f4cec5b6..b31bd8f4222 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineutils.h
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineutils.h
@@ -39,6 +39,11 @@ namespace TimelineUtils {
 
 enum class Side { Top, Right, Bottom, Left };
 
+inline bool isDeleteKey(int key)
+{
+    return (key == Qt::Key_Backspace) || (key == Qt::Key_Delete);
+}
+
 template<typename T>
 inline T clamp(const T &value, const T &lo, const T &hi)
 {
diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.cpp
index ab82744cc67..e2b95783569 100644
--- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.cpp
+++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.cpp
@@ -39,6 +39,7 @@
 #include "timelineplaceholder.h"
 #include "timelinepropertyitem.h"
 #include "timelinesectionitem.h"
+#include "timelineutils.h"
 
 #include <designdocumentview.h>
 #include <exception.h>
@@ -73,14 +74,6 @@
 
 namespace QmlDesigner {
 
-static int deleteKey()
-{
-    if (Utils::HostOsInfo::isMacHost())
-        return Qt::Key_Backspace;
-
-    return Qt::Key_Delete;
-}
-
 TransitionEditorGraphicsScene::TransitionEditorGraphicsScene(TransitionEditorWidget *parent)
     : AbstractScrollGraphicsScene(parent)
     , m_parent(parent)
@@ -459,7 +452,7 @@ bool TransitionEditorGraphicsScene::event(QEvent *event)
 {
     switch (event->type()) {
     case QEvent::ShortcutOverride:
-        if (static_cast<QKeyEvent *>(event)->key() == deleteKey()) {
+        if (TimelineUtils::isDeleteKey(static_cast<QKeyEvent *>(event)->key())) {
             QGraphicsScene::keyPressEvent(static_cast<QKeyEvent *>(event));
             event->accept();
             return true;