fixed TODO:

Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton
This commit is contained in:
Emmanuel Pescosta 2014-09-11 14:51:06 +02:00
parent 32b51b7b92
commit b111b1482a
2 changed files with 3 additions and 5 deletions

View file

@ -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;

View file

@ -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();
}
}