Remove unnecessary state keeping in input device

Change-Id: I6325573d27b099a21fa5ac5e141764d5172b2453
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index f372942..adb6482 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -68,7 +68,6 @@ QWaylandInputDevice::QWaylandInputDevice(QWaylandDisplay *display,
     , mPointerFocus(NULL)
     , mKeyboardFocus(NULL)
     , mButtons(0)
-    , mTouchState(QEvent::TouchBegin)
 {
     mInputDevice = static_cast<struct wl_input_device *>
             (wl_display_bind(mDisplay,id,&wl_input_device_interface));
@@ -503,10 +502,8 @@ void QWaylandInputDevice::handleTouchFrame()
 
     if (allReleased) {
         QWindowSystemInterface::handleTouchEvent(0, mTouchDevice, mTouchPoints);
-        mTouchState = QEvent::TouchBegin;
         mPrevTouchPoints.clear();
-    } else if (mTouchState == QEvent::TouchBegin)
-        mTouchState = QEvent::TouchUpdate;
+    }
 }
 
 void QWaylandInputDevice::inputHandleTouchCancel(void *data, struct wl_input_device *wl_input_device)

diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice.h
index c69523f..313fa9f 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.h
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.h
@@ -130,7 +130,6 @@ private:
     void handleTouchFrame();
     QList<QWindowSystemInterface::TouchPoint> mTouchPoints;
     QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints;
-    QEvent::Type mTouchState;
     QTouchDevice *mTouchDevice;
 };