aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcontrol.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-07-06 13:26:20 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-07-07 09:07:03 +0000
commit23482c09b812c0254ba5357e070441a6d847d7b2 (patch)
tree7dca735cc6bface86b6f28172f50d2ce56ed9c52 /src/quicktemplates2/qquickcontrol.cpp
parent57810c5c736f69790dd49fa1146eb70de8c95a55 (diff)
Remove redundant code in touch event handlers
QEvent::TouchUpdate can contain touch points in any states. It iterates the list of points and calls handlePress/Move/Release(). We can re-use the same handling for QEvent::TouchBegin() (pressed) and QEvent::TouchEnd() (released). This change does not fix anything but makes the next steps easier. Change-Id: I29edd949579ab6a4bf923e455a1ef38adb05e3a5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
-rw-r--r--src/quicktemplates2/qquickcontrol.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index fb6c17f7..34cc67a7 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1374,13 +1374,8 @@ void QQuickControl::touchEvent(QTouchEvent *event)
Q_D(QQuickControl);
switch (event->type()) {
case QEvent::TouchBegin:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (d->acceptTouch(point))
- d->handlePress(point.pos());
- }
- break;
-
case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
if (!d->acceptTouch(point))
continue;
@@ -1401,13 +1396,6 @@ void QQuickControl::touchEvent(QTouchEvent *event)
}
break;
- case QEvent::TouchEnd:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (d->acceptTouch(point))
- d->handleRelease(point.pos());
- }
- break;
-
case QEvent::TouchCancel:
d->handleUngrab();
break;