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>

4 files changed, 22 insertions, 22 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index d133729625..90e72ebde6 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -548,7 +548,7 @@ void QQuickEventPoint::reset(Qt::TouchPointState state, const QPointF &scenePos,
 void QQuickEventPoint::localizePosition(QQuickItem *target)
 {
     if (target)
-        m_pos = target->mapFromScene(scenePos());
+        m_pos = target->mapFromScene(scenePosition());
     else
         m_pos = QPointF();
 }
@@ -938,8 +938,8 @@ QQuickPointerEvent *QQuickPointerTouchEvent::reset(QEvent *event)
         if (auto point = pointById(pid)) {
             preserves[i].pointId = pid;
             preserves[i].pressTimestamp = point->m_pressTimestamp;
-            preserves[i].scenePressPos = point->scenePressPos();
-            preserves[i].sceneGrabPos = point->sceneGrabPos();
+            preserves[i].scenePressPos = point->scenePressPosition();
+            preserves[i].sceneGrabPos = point->sceneGrabPosition();
             preserves[i].grabber = point->exclusiveGrabber();
             preserves[i].passiveGrabbers = point->passiveGrabbers();
         }
@@ -1155,7 +1155,7 @@ QVector<QPointF> QQuickPointerEvent::unacceptedPressedPointScenePositions() cons
     QVector<QPointF> points;
     for (int i = 0; i < pointCount(); ++i) {
         if (!point(i)->isAccepted() && point(i)->state() == QQuickEventPoint::Pressed)
-            points << point(i)->scenePos();
+            points << point(i)->scenePosition();
     }
     return points;
 }
@@ -1277,7 +1277,7 @@ QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item, bool i
         if (isGrabber)
             anyGrabber = true;
         // include points inside the bounds if no other item is the grabber or if the item is filtering
-        bool isInside = item->contains(item->mapFromScene(p->scenePos()));
+        bool isInside = item->contains(item->mapFromScene(p->scenePosition()));
         bool hasAnotherGrabber = p->exclusiveGrabber() && p->exclusiveGrabber() != item;
 
         // filtering: (childMouseEventFilter) include points that are grabbed by children of the target item
@@ -1395,7 +1395,7 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *eve
     dbg << "QQuickEventPoint(accepted:" << event->isAccepted()
         << " state:";
     QtDebugUtils::formatQEnum(dbg, event->state());
-    dbg << " scenePos:" << event->scenePos() << " id:" << hex << event->pointId() << dec
+    dbg << " scenePos:" << event->scenePosition() << " id:" << hex << event->pointId() << dec
         << " timeHeld:" << event->timeHeld() << ')';
     return dbg;
 }
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; }
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 2d129f0823..eb90e92b96 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1667,7 +1667,7 @@ QMouseEvent *QQuickWindowPrivate::cloneMouseEvent(QMouseEvent *event, QPointF *t
 void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent)
 {
     auto point = pointerEvent->point(0);
-    lastMousePosition = point->scenePos();
+    lastMousePosition = point->scenePosition();
     const bool mouseIsReleased = (point->state() == QQuickEventPoint::Released && pointerEvent->buttons() == Qt::NoButton);
 
     if (point->exclusiveGrabber()) {
@@ -1722,7 +1722,7 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven
             }
             // If some points weren't grabbed, deliver to non-grabber PointerHandlers in reverse paint order
             if (!pointerEvent->allPointsGrabbed() && pointerEvent->buttons()) {
-                QVector<QQuickItem *> targetItems = pointerTargets(contentItem, point->scenePos(), false, false);
+                QVector<QQuickItem *> targetItems = pointerTargets(contentItem, point->scenePosition(), false, false);
                 for (QQuickItem *item : targetItems) {
                     QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
                     pointerEvent->localize(item);
@@ -2387,7 +2387,7 @@ void QQuickWindowPrivate::deliverUpdatedTouchPoints(QQuickPointerTouchEvent *eve
                 QQuickEventPoint *point = event->point(i);
                 if (point->state() == QQuickEventPoint::Pressed)
                     continue; // presses were delivered earlier; not the responsibility of deliverUpdatedTouchPoints
-                QVector<QQuickItem *> targetItemsForPoint = pointerTargets(contentItem, point->scenePos(), false, false);
+                QVector<QQuickItem *> targetItemsForPoint = pointerTargets(contentItem, point->scenePosition(), false, false);
                 if (targetItems.count()) {
                     targetItems = mergePointerTargets(targetItems, targetItemsForPoint);
                 } else {
@@ -2419,7 +2419,7 @@ bool QQuickWindowPrivate::deliverPressOrReleaseEvent(QQuickPointerEvent *event,
         point->setAccepted(false); // because otherwise touchEventForItem will ignore it
         if (point->grabberPointerHandler() && point->state() == QQuickEventPoint::Released)
             point->setGrabberPointerHandler(nullptr, true);
-        QVector<QQuickItem *> targetItemsForPoint = pointerTargets(contentItem, point->scenePos(), !isTouchEvent, isTouchEvent);
+        QVector<QQuickItem *> targetItemsForPoint = pointerTargets(contentItem, point->scenePosition(), !isTouchEvent, isTouchEvent);
         if (targetItems.count()) {
             targetItems = mergePointerTargets(targetItems, targetItemsForPoint);
         } else {
@@ -2486,7 +2486,7 @@ void QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo
             // The only reason to already have a mouse grabber here is
             // synthetic events - flickable sends one when setPressDelay is used.
             auto oldMouseGrabber = q->mouseGrabberItem();
-            QPointF localPos = item->mapFromScene(point->scenePos());
+            QPointF localPos = item->mapFromScene(point->scenePosition());
             Q_ASSERT(item->contains(localPos)); // transform is checked already
             QMouseEvent *me = event->asMouseEvent(localPos);
             me->accept();
@@ -2779,7 +2779,7 @@ bool QQuickWindowPrivate::sendFilteredPointerEvent(QQuickPointerEvent *event, QQ
                 continue; // a filtering item never needs to filter for itself
             if (filteringParentsToSkip.contains(filteringParent))
                 continue;
-            QPointF localPos = item->mapFromScene(pme->point(0)->scenePos());
+            QPointF localPos = item->mapFromScene(pme->point(0)->scenePosition());
             QMouseEvent *me = pme->asMouseEvent(localPos);
             if (filteringParent->childMouseEventFilter(item, me))
                 ret = true;
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 36b2c57e5c..0bd909603d 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -298,7 +298,7 @@ public:
 
     static bool dragOverThreshold(const QQuickEventPoint *point)
     {
-        QPointF delta = point->scenePos() - point->scenePressPos();
+        QPointF delta = point->scenePosition() - point->scenePressPosition();
         return (QQuickWindowPrivate::dragOverThreshold(delta.x(), Qt::XAxis, point) ||
                 QQuickWindowPrivate::dragOverThreshold(delta.y(), Qt::YAxis, point));
     }