diff options
| author | Sebastian Dörner <[email protected]> | 2011-02-27 23:06:14 +0100 |
|---|---|---|
| committer | Sebastian Dörner <[email protected]> | 2011-02-27 23:06:14 +0100 |
| commit | 2a5b3ec615bb4e8123bdf5572eb9058d73740f22 (patch) | |
| tree | 8edd787342b4dd6ac4cb528fcc007593d852f38e /src | |
| parent | 1b2b63eb3a01025e03ff964f187adda52c62bcb3 (diff) | |
Consistently use binary operators to connect QFlags
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 3e63dc6c9..c50a42a40 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -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")); |