From 5a2ea0c7ee293de0f2a8da424c2890e317924263 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 26 Jul 2016 22:14:44 +0200 Subject: Touch handling: Remove acceptedNewPoints The state is moved into the points, continue cleanup of no longer needed hard to understand code. Change-Id: I1f63f3ac844ac240bc8595bdc936778800726863 Reviewed-by: Frederik Gladhorn --- src/quick/items/qquickwindow_p.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquickwindow_p.h') diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 194a4040d9..eff23b1b9a 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -167,9 +167,8 @@ public: void deliverPointerEvent(QQuickPointerEvent *); void deliverTouchEvent(QQuickPointerTouchEvent *); bool deliverTouchCancelEvent(QTouchEvent *); - bool deliverPoints(QQuickItem *, QQuickPointerTouchEvent *, const QList &, - QSet *, QHash > *, QSet *); - bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, QSet *acceptedNewPoints, const QSet &matchingNewPoints, QSet *filtered); + bool deliverPoints(QQuickItem *, QQuickPointerTouchEvent *, const QList &, QHash > *, QSet *); + bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, const QSet &matchingNewPoints, QSet *filtered); static QTouchEvent *touchEventForItem(QQuickItem *target, const QTouchEvent &originalEvent, bool alwaysCheckBounds = false); static QTouchEvent *touchEventWithPoints(const QTouchEvent &event, const QList &newPoints); bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QTouchEvent *event, QSet *filtered); -- cgit v1.2.3