QQuickWindow: remove sendFilteredTouchEvent

The functionality is now completely assimilated into
sendFilteredPointerEvent.

Flickable can now steal the touch grab from a TapHandler child,
for example: the TapHandler grabbed the eventpoint, whereas
QQuickFlickable::childMouseEventFilter() was given a synthetic
mouse event derived from the touchpoint which the eventpoint
represented, and we fully follow through the consequences of that.
If an Item filters a press event, avoid doing normal delivery
to that same Item again.

Change-Id: Icd9c88ab752f2b728f7d612504013c6dc72ff9fe
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 38c1b0a4d4..b0d4d1ce01 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -168,10 +168,9 @@ public:
     void deliverPointerEvent(QQuickPointerEvent *);
     void deliverTouchEvent(QQuickPointerTouchEvent *);
     bool deliverTouchCancelEvent(QTouchEvent *);
-    bool deliverPressEvent(QQuickPointerEvent *, QSet<QQuickItem *> *);
-    bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event, QSet<QQuickItem *> *hasFiltered);
-    bool deliverMatchingPointsToItem(QQuickItem *item, QQuickPointerEvent *pointerEvent, QSet<QQuickItem*> *filtered);
-    bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QQuickPointerTouchEvent *event, QSet<QQuickItem*> *filtered);
+    bool deliverPressEvent(QQuickPointerEvent *);
+    bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event);
+    bool deliverMatchingPointsToItem(QQuickItem *item, QQuickPointerEvent *pointerEvent);
 
     QVector<QQuickItem *> pointerTargets(QQuickItem *, const QPointF &, bool checkMouseButtons) const;
     QVector<QQuickItem *> mergePointerTargets(const QVector<QQuickItem *> &list1, const QVector<QQuickItem *> &list2) const;