Merge branch 'Applications/14.12' into frameworks

[dolphin.git] / src / kitemviews / kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index e90f301a98e52f1042272e14c2d4606715533336..812d1c94990ca5252ab585e0640f333f76b7a358 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -24,7 +24,7 @@
 #include "kitemlistcontroller.h"
 
 #include <KGlobalSettings>
 #include "kitemlistcontroller.h"
 
 #include <KGlobalSettings>

-#include <KDebug>
+#include <QDebug>

 
 #include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"
 
 #include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"


@@ -538,8 +538,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
     emit mouseButtonPressed(m_pressedIndex, event->buttons());
 
     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;
         // Do not select items when clicking the back/forward buttons, see
         // https://bugs.kde.org/show_bug.cgi?id=327412.
         return true;


@@ -1310,4 +1309,3 @@ void KItemListController::updateExtendedSelectionRegion()
     }
 }
 
     }
 }
 

-#include "kitemlistcontroller.moc"