aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmultipointtoucharea.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-05-18 13:03:22 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-23 06:54:25 +0200
commit14c8b9e260f2f525d0b4ac3bd87620efe11af621 (patch)
tree406946962dce4a37f3d2eebc72dc4b628dbee119 /src/quick/items/qquickmultipointtoucharea.cpp
parent9e239d0f653e8f37d0befb27aa3165d4723279a0 (diff)
Remove deprectated MultiPointTouchArea signals.
Change-Id: Icea6d17704b2ddb7917bc0c0fea11dd625562685 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index ed13ecc9ab..b35ca83423 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<QQuickTouchPoint*>(obj)->setPressed(false);
emit canceled(_touchPoints.values());
- emit touchPointsCanceled(_touchPoints.values());
clearTouchLists();
foreach (QObject *obj, _touchPoints) {
QQuickTouchPoint *dtp = static_cast<QQuickTouchPoint*>(obj);