From 49e37db95227c2d6b252720f4a04c34cc26f8980 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Tue, 19 Jul 2022 15:31:49 +0200 Subject: [PATCH] UI: Use pipe operator instead of plus for Qt keys --- UI/window-basic-filters.cpp | 4 ++-- UI/window-basic-main.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 2897bff02..6b898a4f0 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -956,7 +956,7 @@ void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async) QAction *copyAction = new QAction(QTStr("Copy")); connect(copyAction, SIGNAL(triggered()), this, SLOT(CopyFilter())); - copyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C)); + copyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C)); ui->effectWidget->addAction(copyAction); ui->asyncWidget->addAction(copyAction); popup.addAction(copyAction); @@ -965,7 +965,7 @@ void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async) QAction *pasteAction = new QAction(QTStr("Paste")); pasteAction->setEnabled(main->copyFilter); connect(pasteAction, SIGNAL(triggered()), this, SLOT(PasteFilter())); - pasteAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_V)); + pasteAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_V)); ui->effectWidget->addAction(pasteAction); ui->asyncWidget->addAction(pasteAction); popup.addAction(pasteAction); diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index f8155dc25..900c6511a 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -376,7 +376,7 @@ OBSBasic::OBSBasic(QWidget *parent) #endif #ifdef __linux__ - ui->actionE_xit->setShortcut(Qt::CTRL + Qt::Key_Q); + ui->actionE_xit->setShortcut(Qt::CTRL | Qt::Key_Q); #endif auto addNudge = [this](const QKeySequence &seq, const char *s) { @@ -391,10 +391,10 @@ OBSBasic::OBSBasic(QWidget *parent) addNudge(Qt::Key_Down, SLOT(NudgeDown())); addNudge(Qt::Key_Left, SLOT(NudgeLeft())); addNudge(Qt::Key_Right, SLOT(NudgeRight())); - addNudge(Qt::SHIFT + Qt::Key_Up, SLOT(NudgeUpFar())); - addNudge(Qt::SHIFT + Qt::Key_Down, SLOT(NudgeDownFar())); - addNudge(Qt::SHIFT + Qt::Key_Left, SLOT(NudgeLeftFar())); - addNudge(Qt::SHIFT + Qt::Key_Right, SLOT(NudgeRightFar())); + addNudge(Qt::SHIFT | Qt::Key_Up, SLOT(NudgeUpFar())); + addNudge(Qt::SHIFT | Qt::Key_Down, SLOT(NudgeDownFar())); + addNudge(Qt::SHIFT | Qt::Key_Left, SLOT(NudgeLeftFar())); + addNudge(Qt::SHIFT | Qt::Key_Right, SLOT(NudgeRightFar())); assignDockToggle(ui->scenesDock, ui->toggleScenes); assignDockToggle(ui->sourcesDock, ui->toggleSources); @@ -404,10 +404,10 @@ OBSBasic::OBSBasic(QWidget *parent) assignDockToggle(statsDock, ui->toggleStats); // Register shortcuts for Undo/Redo - ui->actionMainUndo->setShortcut(Qt::CTRL + Qt::Key_Z); + ui->actionMainUndo->setShortcut(Qt::CTRL | Qt::Key_Z); QList shrt; - shrt << QKeySequence((Qt::CTRL | Qt::SHIFT) + Qt::Key_Z) - << QKeySequence(Qt::CTRL + Qt::Key_Y); + shrt << QKeySequence((Qt::CTRL | Qt::SHIFT) | Qt::Key_Z) + << QKeySequence(Qt::CTRL | Qt::Key_Y); ui->actionMainRedo->setShortcuts(shrt); ui->actionMainUndo->setShortcutContext(Qt::ApplicationShortcut);