Commit bb04fe1d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

operator+/- is disabled for QFlags in qt6

parent bf74fe0c
Pipeline #43375 passed with stage
in 19 minutes and 19 seconds
......@@ -432,12 +432,12 @@ void MainWindow::initActions()
mActionCopy = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18nc("@action", "&Copy..."), this);
actions->addAction(QStringLiteral("copy"), mActionCopy);
actions->setDefaultShortcut(mActionCopy, QKeySequence(Qt::SHIFT + Qt::Key_Insert));
actions->setDefaultShortcut(mActionCopy, QKeySequence(Qt::SHIFT | Qt::Key_Insert));
connect(mActionCopy, &QAction::triggered, this, &MainWindow::slotCopy);
mActionModify = new QAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18nc("@action", "&Edit..."), this);
actions->addAction(QStringLiteral("modify"), mActionModify);
actions->setDefaultShortcut(mActionModify, QKeySequence(Qt::CTRL + Qt::Key_E));
actions->setDefaultShortcut(mActionModify, QKeySequence(Qt::CTRL | Qt::Key_E));
connect(mActionModify, &QAction::triggered, this, &MainWindow::slotModify);
mActionDelete = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action", "&Delete"), this);
......@@ -448,17 +448,17 @@ void MainWindow::initActions()
// Set up Shift-Delete as a shortcut to delete without confirmation
mActionDeleteForce = new QAction(i18nc("@action", "Delete Without Confirmation"), this);
actions->addAction(QStringLiteral("delete-force"), mActionDeleteForce);
actions->setDefaultShortcut(mActionDeleteForce, QKeySequence::Delete + Qt::SHIFT);
actions->setDefaultShortcut(mActionDeleteForce, QKeySequence::Delete | Qt::SHIFT);
connect(mActionDeleteForce, &QAction::triggered, this, &MainWindow::slotDeleteForce);
mActionReactivate = new QAction(i18nc("@action", "Reac&tivate"), this);
actions->addAction(QStringLiteral("undelete"), mActionReactivate);
actions->setDefaultShortcut(mActionReactivate, QKeySequence(Qt::CTRL + Qt::Key_R));
actions->setDefaultShortcut(mActionReactivate, QKeySequence(Qt::CTRL | Qt::Key_R));
connect(mActionReactivate, &QAction::triggered, this, &MainWindow::slotReactivate);
mActionEnable = new QAction(this);
actions->addAction(QStringLiteral("disable"), mActionEnable);
actions->setDefaultShortcut(mActionEnable, QKeySequence(Qt::CTRL + Qt::Key_B));
actions->setDefaultShortcut(mActionEnable, QKeySequence(Qt::CTRL | Qt::Key_B));
connect(mActionEnable, &QAction::triggered, this, &MainWindow::slotEnable);
action = new QAction(i18nc("@action", "Wake From Suspend..."), this);
......@@ -471,7 +471,7 @@ void MainWindow::initActions()
mActionShowArchived = new KToggleAction(i18nc("@action", "Show Archi&ved Alarms"), this);
actions->addAction(QStringLiteral("showArchivedAlarms"), mActionShowArchived);
actions->setDefaultShortcut(mActionShowArchived, QKeySequence(Qt::CTRL + Qt::Key_P));
actions->setDefaultShortcut(mActionShowArchived, QKeySequence(Qt::CTRL | Qt::Key_P));
connect(mActionShowArchived, &KToggleAction::triggered, this, &MainWindow::slotShowArchived);
mActionToggleTrayIcon = new KToggleAction(i18nc("@action", "Show in System &Tray"), this);
......
......@@ -32,10 +32,10 @@ using namespace KAlarmCal;
#define MAIL_ICON QStringLiteral("mail-message-new")
#define AUDIO_ICON QStringLiteral("new-audio-alarm")
#define TEMPLATE_ICON QStringLiteral("document-new-from-template")
#define DISP_KEY QKeySequence(Qt::CTRL + Qt::Key_D)
#define CMD_KEY QKeySequence(Qt::CTRL + Qt::Key_C)
#define MAIL_KEY QKeySequence(Qt::CTRL + Qt::Key_L)
#define AUDIO_KEY QKeySequence(Qt::CTRL + Qt::Key_U)
#define DISP_KEY QKeySequence(Qt::CTRL | Qt::Key_D)
#define CMD_KEY QKeySequence(Qt::CTRL | Qt::Key_C)
#define MAIL_KEY QKeySequence(Qt::CTRL | Qt::Key_L)
#define AUDIO_KEY QKeySequence(Qt::CTRL | Qt::Key_U)
/******************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment