diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-09-11 14:51:06 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-09-11 14:51:06 +0200 |
| commit | b111b1482ad7f2fe7989e3ee53ddfe04eb73fa9c (patch) | |
| tree | 0177a550aa21fd8ce4ba363a1a0c824a913b84a1 | |
| parent | 32b51b7b92e16cfaf1121cbe80ca267fc8bb0718 (diff) | |
fixed TODO:
Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton
| -rw-r--r-- | src/kitemviews/kitemlistcontroller.cpp | 3 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 854a0087a..1cd06c7e1 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -538,8 +538,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const m_pressedIndex = m_view->itemAt(m_pressedMousePos); emit mouseButtonPressed(m_pressedIndex, event->buttons()); - // TODO: Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton - if (event->buttons() & (Qt::XButton1 | Qt::XButton2)) { + if (event->buttons() & (Qt::BackButton | Qt::ForwardButton)) { // Do not select items when clicking the back/forward buttons, see // https://bugs.kde.org/show_bug.cgi?id=327412. return true; diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index e7034984e..17465eaa9 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1084,10 +1084,9 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons hideToolTip(); - // TODO: Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton - if (buttons & Qt::XButton1) { + if (buttons & Qt::BackButton) { emit goBackRequested(); - } else if (buttons & Qt::XButton2) { + } else if (buttons & Qt::ForwardButton) { emit goForwardRequested(); } } |