X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Ftreeviewtouch.cpp;h=31da5ed52569f41101d11c8d22142456645d8263;hb=c18e611a6b8c07049cc82b2dcdb5b138d9a6dd43;hp=0ef3b36630c24a730ae507c994dd646fa62b3af2;hpb=5b164bbc62960cea62a31287f679197b623ad7ac;p=quassel.git

diff --git a/src/uisupport/treeviewtouch.cpp b/src/uisupport/treeviewtouch.cpp
index 0ef3b366..31da5ed5 100644
--- a/src/uisupport/treeviewtouch.cpp
+++ b/src/uisupport/treeviewtouch.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,16 +24,15 @@
 #include <QScrollBar>
 #include <QTouchEvent>
 
-
-TreeViewTouch::TreeViewTouch(QWidget *parent)
+TreeViewTouch::TreeViewTouch(QWidget* parent)
     : QTreeView(parent)
 {
     setAttribute(Qt::WA_AcceptTouchEvents);
 }
 
-
-bool TreeViewTouch::event(QEvent *event) {
-    if (event->type() == QEvent::TouchBegin) {
+bool TreeViewTouch::event(QEvent* event)
+{
+    if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) {
         // Register that we may be scrolling, set the scroll mode to scroll-per-pixel
         // and accept the event (return true) so that we will receive TouchUpdate and TouchEnd/TouchCancel
         _touchScrollInProgress = true;
@@ -58,11 +57,7 @@ bool TreeViewTouch::event(QEvent *event) {
         return true;
     }
 
-#if QT_VERSION >= 0x050000
     if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) {
-#else
-    if (event->type() == QEvent::TouchEnd) {
-#endif
         // End scroll and reset variables
         _touchScrollInProgress = false;
         _firstTouchUpdateHappened = false;
@@ -72,14 +67,14 @@ bool TreeViewTouch::event(QEvent *event) {
     return QTreeView::event(event);
 }
 
-
-void TreeViewTouch::mousePressEvent(QMouseEvent *event) {
+void TreeViewTouch::mousePressEvent(QMouseEvent* event)
+{
     if (!_touchScrollInProgress)
         QTreeView::mousePressEvent(event);
 }
 
-
-void TreeViewTouch::mouseMoveEvent(QMouseEvent *event) {
+void TreeViewTouch::mouseMoveEvent(QMouseEvent* event)
+{
     if (!_touchScrollInProgress)
         QTreeView::mouseMoveEvent(event);
-};
+}