From 4ce72674e993ac1254cf799aa39d8b2a6ac942a9 Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz@gmail.com>
Date: Sat, 3 Aug 2024 17:27:17 +0200
Subject: [PATCH] interface/Menu: Use only Qt::Key enums for QKeySequence.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes the C++20 warning:
bitwise operation between different enumeration types ‘Qt::Modifier’ and ‘Qt::Key’ is deprecated [-Wdeprecated-enum-enum-conversion]
---
 interface/src/Menu.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index c1d7c05f79..fb1fc46b7b 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -106,7 +106,7 @@ Menu::Menu() {
     });
 
     // File > Quit
-    addActionToQMenuAndActionHash(fileMenu, MenuOption::Quit, Qt::CTRL | Qt::Key_Q, qApp, SLOT(quit()), QAction::QuitRole);
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::Quit, Qt::Key_Control | Qt::Key_Q, qApp, SLOT(quit()), QAction::QuitRole);
 
 
     // Edit menu ----------------------------------
@@ -143,7 +143,7 @@ Menu::Menu() {
     editMenu->addSeparator();
 
     // Edit > Running Scripts
-    auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J);
+    auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::Key_Control | Qt::Key_J);
     connect(action, &QAction::triggered, [] {
         if (!qApp->getLoginDialogPoppedUp()) {
             static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml");
@@ -157,7 +157,7 @@ Menu::Menu() {
 
     // Edit > Asset Browser
     auto assetServerAction = addActionToQMenuAndActionHash(editMenu, MenuOption::AssetServer,
-                                                           Qt::CTRL | Qt::SHIFT | Qt::Key_A,
+                                                           Qt::Key_Control | Qt::Key_Shift | Qt::Key_A,
                                                            qApp, SLOT(showAssetServerWidget()));
     {
         auto nodeList = DependencyManager::get<NodeList>();
@@ -253,7 +253,7 @@ Menu::Menu() {
     MenuWrapper* settingsMenu = addMenu("Settings");
 
     // Settings > General...
-    action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr);
+    action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::Key_Control | Qt::Key_G, nullptr, nullptr);
     connect(action, &QAction::triggered, [] {
         if (!qApp->getLoginDialogPoppedUp()) {
             qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"),
@@ -349,7 +349,7 @@ Menu::Menu() {
     MenuWrapper* scriptingOptionsMenu = developerMenu->addMenu("Scripting");
 
     // Developer > Scripting > Console...
-    addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,
+    addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::Console, Qt::Key_Control | Qt::Key_Alt | Qt::Key_J,
                                   DependencyManager::get<StandAloneJSConsole>().data(),
                                   SLOT(toggleConsole()),
                                   QAction::NoRole,