aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmultipointtoucharea_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2011-12-30 16:39:17 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-03 01:27:55 +0100
commit0f36211f84d8cf7d478c844ff48d1b618f7ae24f (patch)
tree0f6f08456a96d63f81872aa2c776a8168110c418 /src/quick/items/qquickmultipointtoucharea_p.h
parent6aa535e39f79548934a5c3a142e13bb09333296a (diff)
Simplify MultiPointTouchArea signal names.
Change-Id: I0617bf7138b76495c111739e2cbdf3b77c4b6a5d Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea_p.h')
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index dbce42853b..d182ab85cf 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -217,15 +217,21 @@ public:
}
Q_SIGNALS:
- void touchPointsPressed(const QList<QObject*> &touchPoints);
- void touchPointsUpdated(const QList<QObject*> &touchPoints);
- void touchPointsReleased(const QList<QObject*> &touchPoints);
- void touchPointsCanceled(const QList<QObject*> &touchPoints);
+ void pressed(const QList<QObject*> &touchPoints);
+ void updated(const QList<QObject*> &touchPoints);
+ void released(const QList<QObject*> &touchPoints);
+ void canceled(const QList<QObject*> &touchPoints);
void gestureStarted(QQuickGrabGestureEvent *gesture);
void touchUpdated(const QList<QObject*> &touchPoints);
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);