]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Consistently use binary operators to connect QFlags
authorSebastian Dörner <sebastian@sebastian-doerner.de>
Sun, 27 Feb 2011 22:06:14 +0000 (23:06 +0100)
committerSebastian Dörner <sebastian@sebastian-doerner.de>
Sun, 27 Feb 2011 22:06:14 +0000 (23:06 +0100)
src/dolphinmainwindow.cpp

index 3e63dc6c95422ae03e0dbc35e17d595a6b0c96ba..c50a42a404f9e4675a18ed7b5e4dbd83980f967b 100644 (file)
@@ -1449,7 +1449,7 @@ void DolphinMainWindow::setupActions()
     // doesn't work
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
-    cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
+    cutShortcut.remove(Qt::SHIFT | Qt::Key_Delete, KShortcut::KeepEmpty);
     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
@@ -1462,7 +1462,7 @@ void DolphinMainWindow::setupActions()
 
     KAction* selectAll = actionCollection()->addAction("select_all");
     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
-    selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
+    selectAll->setShortcut(Qt::CTRL | Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     KAction* invertSelection = actionCollection()->addAction("invert_selection");
@@ -1554,11 +1554,11 @@ void DolphinMainWindow::setupActions()
     // not in menu actions
     QList<QKeySequence> nextTabKeys;
     nextTabKeys.append(KStandardShortcut::tabNext().primary());
-    nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab));
+    nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
 
     QList<QKeySequence> prevTabKeys;
     prevTabKeys.append(KStandardShortcut::tabPrev().primary());
-    prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
+    prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
 
     KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));