Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 18:28:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface/Menu: Use only Qt::Key enums for QKeySequence.

Browse source 
Fixes the C++20 warning:
bitwise operation between different enumeration types ‘Qt::Modifier’ and ‘Qt::Key’ is deprecated [-Wdeprecated-enum-enum-conversion]
This commit is contained in:
Lubosz Sarnecki 2024-08-03 17:27:17 +02:00
parent 676de4b75b
commit 4ce72674e9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Menu.cpp
View file

@ -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,