From 14c8b9e260f2f525d0b4ac3bd87620efe11af621 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 18 May 2012 13:03:22 +1000 Subject: [PATCH] Remove deprectated MultiPointTouchArea signals. Change-Id: Icea6d17704b2ddb7917bc0c0fea11dd625562685 Reviewed-by: Yunqiao Yin --- src/quick/items/qquickmultipointtoucharea.cpp | 13 +++---------- src/quick/items/qquickmultipointtoucharea_p.h | 6 ------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index ed13ecc..b35ca83 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -497,18 +497,12 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) } } - if (ended) { + if (ended) emit released(_releasedTouchPoints); - emit touchPointsReleased(_releasedTouchPoints); - } - if (moved) { + if (moved) emit updated(_movedTouchPoints); - emit touchPointsUpdated(_movedTouchPoints); - } - if (started) { + if (started) emit pressed(_pressedTouchPoints); - emit touchPointsPressed(_pressedTouchPoints); - } if (ended || moved || started) emit touchUpdated(_touchPoints.values()); } } @@ -618,7 +612,6 @@ void QQuickMultiPointTouchArea::ungrab() foreach (QObject *obj, _touchPoints) static_cast(obj)->setPressed(false); emit canceled(_touchPoints.values()); - emit touchPointsCanceled(_touchPoints.values()); clearTouchLists(); foreach (QObject *obj, _touchPoints) { QQuickTouchPoint *dtp = static_cast(obj); diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index 3651278..e782fea 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -232,12 +232,6 @@ Q_SIGNALS: void minimumTouchPointsChanged(); void maximumTouchPointsChanged(); - //### deprecated, will be removed for 5.0 - void touchPointsPressed(const QList &touchPoints); - void touchPointsUpdated(const QList &touchPoints); - void touchPointsReleased(const QList &touchPoints); - void touchPointsCanceled(const QList &touchPoints); - protected: void touchEvent(QTouchEvent *); bool childMouseEventFilter(QQuickItem *i, QEvent *event); -- 2.7.4