aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp13
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h6
2 files changed, 3 insertions, 16 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);
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 3651278735..e782fea593 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<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);