Remove deprectated MultiPointTouchArea signals.

Change-Id: Icea6d17704b2ddb7917bc0c0fea11dd625562685
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>

diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index ed13ecc..b35ca83 100644 (file)
--- 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<QQuickTouchPoint*>(obj)->setPressed(false);
         emit canceled(_touchPoints.values());
-        emit touchPointsCanceled(_touchPoints.values());
         clearTouchLists();
         foreach (QObject *obj, _touchPoints) {
             QQuickTouchPoint *dtp = static_cast<QQuickTouchPoint*>(obj);

diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 3651278..e782fea 100644 (file)
--- 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<QObject*> &touchPoints);
-    void touchPointsUpdated(const QList<QObject*> &touchPoints);
-    void touchPointsReleased(const QList<QObject*> &touchPoints);
-    void touchPointsCanceled(const QList<QObject*> &touchPoints);
-
 protected:
     void touchEvent(QTouchEvent *);
     bool childMouseEventFilter(QQuickItem *i, QEvent *event);