diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-07-26 22:14:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-27 14:53:30 +0000 |
| commit | 5a2ea0c7ee293de0f2a8da424c2890e317924263 (patch) | |
| tree | 08b5abb5c86acc7c97ef398be93b3f3eadc64722 /src/quick/items/qquickwindow_p.h | |
| parent | 2190e3771887058587d1b7e0acbdd633aa6f5dad (diff) | |
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 <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
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<const QQuickEventPoint *> &, - QSet<quint64> *, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *); - bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, QSet<quint64> *acceptedNewPoints, const QSet<quint64> &matchingNewPoints, QSet<QQuickItem*> *filtered); + bool deliverPoints(QQuickItem *, QQuickPointerTouchEvent *, const QList<const QQuickEventPoint *> &, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *); + bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, const QSet<quint64> &matchingNewPoints, QSet<QQuickItem*> *filtered); static QTouchEvent *touchEventForItem(QQuickItem *target, const QTouchEvent &originalEvent, bool alwaysCheckBounds = false); static QTouchEvent *touchEventWithPoints(const QTouchEvent &event, const QList<QTouchEvent::TouchPoint> &newPoints); bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QTouchEvent *event, QSet<QQuickItem*> *filtered); |