Skip to content

GitLab

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

operator+/- is disabled for QFlags in qt6

parent 845a9928
Pipeline #43378 passed with stage
in 11 minutes and 30 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
kontactplugin/kaddressbook_plugin.cpp
View file @ fdecf5b9
......@@ -35,7 +35,7 @@ KAddressBookPlugin::KAddressBookPlugin(KontactInterface::Core *core, const QVari
i18nc("@action:inmenu", "New Contact..."), this);
actionCollection()->addAction(QStringLiteral("new_contact"), action);
connect(action, &QAction::triggered, this, &KAddressBookPlugin::slotNewContact);
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C));
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_C));
//action->setHelpText(
// i18nc( "@info:status", "Create a new contact" ) );
action->setWhatsThis(
......@@ -48,7 +48,7 @@ KAddressBookPlugin::KAddressBookPlugin(KontactInterface::Core *core, const QVari
i18nc("@action:inmenu", "New Contact Group..."), this);
actionCollection()->addAction(QStringLiteral("new_contactgroup"), action);
connect(action, &QAction::triggered, this, &KAddressBookPlugin::slotNewContactGroup);
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G));
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_G));
//action->setHelpText(
// i18nc( "@info:status", "Create a new contact group" ) );
action->setWhatsThis(
......
src/mainwidget.cpp
View file @ fdecf5b9
......@@ -657,7 +657,7 @@ void MainWidget::setupActions(KActionCollection *collection)
action = collection->addAction(QStringLiteral("select_all"));
action->setText(i18n("Select All"));
collection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_A));
collection->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::Key_A));
action->setWhatsThis(i18n("Select all contacts in the current address book view."));
connect(action, &QAction::triggered, mItemView, &Akonadi::EntityTreeView::selectAll);
......@@ -671,7 +671,7 @@ void MainWidget::setupActions(KActionCollection *collection)
QAction *act = new QAction(i18nc("@action:inmenu", "Simple (one column)"), mViewModeGroup);
act->setCheckable(true);
act->setData(1);
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_1));
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_1));
act->setWhatsThis(i18n("Show a simple mode of the address book view."));
collection->addAction(QStringLiteral("view_mode_simple"), act);
......@@ -679,12 +679,12 @@ void MainWidget::setupActions(KActionCollection *collection)
act->setCheckable(true);
act->setData(2);
collection->addAction(QStringLiteral("view_mode_2columns"), act);
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_2));
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_2));
act = new QAction(i18nc("@action:inmenu", "Three Columns"), mViewModeGroup);
act->setCheckable(true);
act->setData(3);
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_3));
collection->setDefaultShortcut(act, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_3));
collection->addAction(QStringLiteral("view_mode_3columns"), act);
connect(mViewModeGroup, qOverload<QAction *>(&QActionGroup::triggered), this, qOverload<QAction *>(&MainWidget::setViewMode));
......@@ -698,7 +698,7 @@ void MainWidget::setupActions(KActionCollection *collection)
//If change shortcut change in quicksearchwidget->lineedit->setPlaceholderText
collection->addAction(QStringLiteral("focus_to_quickseach"), mQuickSearchAction);
connect(mQuickSearchAction, &QAction::triggered, mQuickSearchWidget, &QuickSearchWidget::slotFocusQuickSearch);
collection->setDefaultShortcut(mQuickSearchAction, QKeySequence(Qt::ALT + Qt::Key_Q));
collection->setDefaultShortcut(mQuickSearchAction, QKeySequence(Qt::ALT | Qt::Key_Q));
if (!qEnvironmentVariableIsEmpty("KDEPIM_DEBUGGING")) {
action = collection->addAction(QStringLiteral("debug_akonadi_search"));
......
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