diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-03 18:42:09 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-05 11:52:48 +0000 |
| commit | 2617ac5b9df7dfdecf0cb02d5933c40df1a55bbc (patch) | |
| tree | b14cbc0f7335a0397e09014e1953213d086b9ffa /src/quick/items/qquickevents_p_p.h | |
| parent | be3559470ac934dcfed881996be0eeb1269e6f96 (diff) | |
rename QQuickEventPoint pos properties to position
For consistency we always spell it out, although it does make some
of these properties inconveniently verbose.
Change-Id: I64a08c3aa261c0ab89e09472dd47510abafbf7ca
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 48c29f00de..2954695b1b 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -253,10 +253,10 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject { Q_OBJECT Q_PROPERTY(QQuickPointerEvent *event READ pointerEvent) - Q_PROPERTY(QPointF pos READ pos) - Q_PROPERTY(QPointF scenePos READ scenePos) - Q_PROPERTY(QPointF scenePressPos READ scenePressPos) - Q_PROPERTY(QPointF sceneGrabPos READ sceneGrabPos) + Q_PROPERTY(QPointF position READ position) + Q_PROPERTY(QPointF scenePosition READ scenePosition) + Q_PROPERTY(QPointF scenePressPosition READ scenePressPosition) + Q_PROPERTY(QPointF sceneGrabPosition READ sceneGrabPosition) Q_PROPERTY(State state READ state) Q_PROPERTY(int pointId READ pointId) Q_PROPERTY(qreal timeHeld READ timeHeld) @@ -288,14 +288,14 @@ public: QQuickEventPoint(QQuickPointerEvent *parent); - void reset(Qt::TouchPointState state, const QPointF &scenePos, int pointId, ulong timestamp, const QVector2D &velocity = QVector2D()); + void reset(Qt::TouchPointState state, const QPointF &scenePosition, int pointId, ulong timestamp, const QVector2D &velocity = QVector2D()); void localizePosition(QQuickItem *target); QQuickPointerEvent *pointerEvent() const; - QPointF pos() const { return m_pos; } - QPointF scenePos() const { return m_scenePos; } - QPointF scenePressPos() const { return m_scenePressPos; } - QPointF sceneGrabPos() const { return m_sceneGrabPos; } + QPointF position() const { return m_pos; } + QPointF scenePosition() const { return m_scenePos; } + QPointF scenePressPosition() const { return m_scenePressPos; } + QPointF sceneGrabPosition() const { return m_sceneGrabPos; } QVector2D velocity() const { return m_velocity; } State state() const { return m_state; } int pointId() const { return m_pointId; } |