Replace calls to deprecated QEvent accessor functions

Several event accessors were deprecated in
qtbase/24e52c10deedbaef833c0e2c3ee7bee03eacc4f5.

Replacements were generated by clazy using the new qevent-accessors check:
$ export CLAZY_CHECKS=qevent-accessors
$ export CLAZY_EXPORT_FIXES=1
$ ../qt6/configure -platform linux-clang -developer-build -debug
  -no-optimize-debug -opensource -confirm-license -no-pch QMAKE_CXX=clazy
$ make
$ cd ../../qt6/qtdeclarative
$ find . -name "*.clazy.yaml"
$ clang-apply-replacements .

Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: I1be5819506fd5039e86b4494223acbe193e6b0c9
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

6 files changed, 36 insertions, 36 deletions

diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
index 2b6482465c..7bfaac318f 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
@@ -106,31 +106,31 @@ public:
     {
         qCDebug(lcPointerTests) << event << "will accept?" << acceptTouch;
         for (const QTouchEvent::TouchPoint &tp : event->touchPoints())
-            eventList.append(Event(Event::TouchDestination, event->type(), tp.state(), grabTransition(acceptTouch, tp.state()), tp.pos(), tp.scenePos()));
+            eventList.append(Event(Event::TouchDestination, event->type(), tp.state(), grabTransition(acceptTouch, tp.state()), tp.position(), tp.scenePosition()));
         event->setAccepted(acceptTouch);
     }
     void mousePressEvent(QMouseEvent *event)
     {
         qCDebug(lcPointerTests) << event;
-        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointPressed, grabTransition(acceptMouse, Qt::TouchPointPressed), event->pos(), event->windowPos()));
+        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointPressed, grabTransition(acceptMouse, Qt::TouchPointPressed), event->position().toPoint(), event->scenePosition()));
         event->setAccepted(acceptMouse);
     }
     void mouseMoveEvent(QMouseEvent *event)
     {
         qCDebug(lcPointerTests) << event;
-        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointMoved, grabTransition(acceptMouse, Qt::TouchPointMoved), event->pos(), event->windowPos()));
+        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointMoved, grabTransition(acceptMouse, Qt::TouchPointMoved), event->position().toPoint(), event->scenePosition()));
         event->setAccepted(acceptMouse);
     }
     void mouseReleaseEvent(QMouseEvent *event)
     {
         qCDebug(lcPointerTests) << event;
-        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointReleased, grabTransition(acceptMouse, Qt::TouchPointReleased), event->pos(), event->windowPos()));
+        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointReleased, grabTransition(acceptMouse, Qt::TouchPointReleased), event->position().toPoint(), event->scenePosition()));
         event->setAccepted(acceptMouse);
     }
     void mouseDoubleClickEvent(QMouseEvent *event)
     {
         qCDebug(lcPointerTests) << event;
-        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointPressed, grabTransition(acceptMouse, Qt::TouchPointPressed), event->pos(), event->windowPos()));
+        eventList.append(Event(Event::MouseDestination, event->type(), Qt::TouchPointPressed, grabTransition(acceptMouse, Qt::TouchPointPressed), event->position().toPoint(), event->scenePosition()));
         event->setAccepted(acceptMouse);
     }
 
@@ -162,7 +162,7 @@ public:
                 event->type() == QEvent::TouchEnd) {
             QTouchEvent *touch = static_cast<QTouchEvent*>(event);
             for (const QTouchEvent::TouchPoint &tp : touch->touchPoints())
-                eventList.append(Event(Event::FilterDestination, event->type(), tp.state(), QQuickEventPoint::GrabExclusive, tp.pos(), tp.scenePos()));
+                eventList.append(Event(Event::FilterDestination, event->type(), tp.state(), QQuickEventPoint::GrabExclusive, tp.position(), tp.scenePosition()));
             if (filterTouch)
                 event->accept();
             return true;
@@ -265,7 +265,7 @@ protected:
         }
         QMouseEvent *me = static_cast<QMouseEvent*>(event);
         filteredEventList.append(Event(Event::FilterDestination, event->type(), tpState,
-                                       0, me->pos(), me->globalPos()));
+                                       0, me->position().toPoint(), me->globalPosition().toPoint()));
         return false;
     }
 
diff --git a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
index f1288c2dbe..8523d91e5c 100644
--- a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
+++ b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
@@ -77,7 +77,7 @@ public:
     void dragEnterEvent(QDragEnterEvent *event)
     {
         ++enterEvents;
-        position = event->pos();
+        position = event->position().toPoint();
         defaultAction = event->dropAction();
         proposedAction = event->proposedAction();
         supportedActions = event->possibleActions();
@@ -87,7 +87,7 @@ public:
     void dragMoveEvent(QDragMoveEvent *event)
     {
         ++moveEvents;
-        position = event->pos();
+        position = event->position().toPoint();
         defaultAction = event->dropAction();
         proposedAction = event->proposedAction();
         supportedActions = event->possibleActions();
@@ -103,7 +103,7 @@ public:
     void dropEvent(QDropEvent *event)
     {
         ++dropEvents;
-        position = event->pos();
+        position = event->position().toPoint();
         defaultAction = event->dropAction();
         proposedAction = event->proposedAction();
         supportedActions = event->possibleActions();
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index f3659290eb..9f7cfa842e 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -119,7 +119,7 @@ protected:
         }
         touchPointStates << touchpoint.state();
         ++touchEvents;
-        m_pos = touchpoint.pos();
+        m_pos = touchpoint.position();
         emit posChanged();
     }
 
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index abb5142304..77f183ad2a 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -1349,7 +1349,7 @@ void tst_qquickitem::touchEventAcceptIgnore()
         QTouchEvent::TouchPoint point;
         point.setId(1);
         point.setPos(QPointF(50, 50));
-        point.setScreenPos(point.pos());
+        point.setScreenPos(point.position());
         point.setState(Qt::TouchPointPressed);
 
         QTouchEvent event(QEvent::TouchBegin, device,
@@ -1373,7 +1373,7 @@ void tst_qquickitem::touchEventAcceptIgnore()
         QTouchEvent::TouchPoint point;
         point.setId(1);
         point.setPos(QPointF(60, 60));
-        point.setScreenPos(point.pos());
+        point.setScreenPos(point.position());
         point.setState(Qt::TouchPointMoved);
 
         QTouchEvent event(QEvent::TouchUpdate, device,
@@ -1397,7 +1397,7 @@ void tst_qquickitem::touchEventAcceptIgnore()
         QTouchEvent::TouchPoint point;
         point.setId(1);
         point.setPos(QPointF(60, 60));
-        point.setScreenPos(point.pos());
+        point.setScreenPos(point.position());
         point.setState(Qt::TouchPointReleased);
 
         QTouchEvent event(QEvent::TouchEnd, device,
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index f32f57614d..cd551c1837 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -68,7 +68,7 @@ static QTouchEvent::TouchPoint makeTouchPoint(QQuickItem *item, const QPointF &p
     tp.setLastPos(last);
     tp.setScenePos(item->mapToScene(p));
     tp.setLastScenePos(item->mapToScene(last));
-    tp.setScreenPos(item->window()->mapToGlobal(tp.scenePos().toPoint()));
+    tp.setScreenPos(item->window()->mapToGlobal(tp.scenePosition().toPoint()));
     tp.setLastScreenPos(item->window()->mapToGlobal(tp.lastScenePos().toPoint()));
     return tp;
 }
@@ -88,7 +88,7 @@ static TouchEventData makeTouchData(QEvent::Type type, QWindow *w, Qt::TouchPoin
 
 #define COMPARE_TOUCH_POINTS(tp1, tp2) \
 { \
-    QCOMPARE(tp1.pos(), tp2.pos()); \
+    QCOMPARE(tp1.position(), tp2.pos()); \
     QCOMPARE(tp1.lastPos(), tp2.lastPos()); \
     QCOMPARE(tp1.scenePos(), tp2.scenePos()); \
     QCOMPARE(tp1.lastScenePos(), tp2.lastScenePos()); \
@@ -214,7 +214,7 @@ public:
             return;
         }
         mousePressCount = ++mousePressNum;
-        lastMousePos = e->pos();
+        lastMousePos = e->position().toPoint();
         lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
     }
 
@@ -226,7 +226,7 @@ public:
         mouseMoveCount = ++mouseMoveNum;
         lastVelocityFromMouseMove = QGuiApplicationPrivate::mouseEventVelocity(e);
         lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
-        lastMousePos = e->pos();
+        lastMousePos = e->position().toPoint();
     }
 
     void mouseReleaseEvent(QMouseEvent *e) {
@@ -235,7 +235,7 @@ public:
             return;
         }
         ++mouseReleaseNum;
-        lastMousePos = e->pos();
+        lastMousePos = e->position().toPoint();
         lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
     }
 
@@ -1024,15 +1024,15 @@ void tst_qquickwindow::touchEvent_velocity()
     QMatrix4x4 transformMatrix;
     transformMatrix.rotate(-90, 0, 0, 1); // counterclockwise
     QVector2D transformedVelocity = transformMatrix.mapVector(velocity).toVector2D();
-    points[0].setPos(points[0].pos() + QPointF(5, 5));
-    points[0].setScreenPos(points[0].screenPos() + QPointF(5, 5));
+    points[0].setPos(points[0].position() + QPointF(5, 5));
+    points[0].setScreenPos(points[0].globalPosition() + QPointF(5, 5));
     QWindowSystemInterface::handleTouchEvent(window, touchDeviceWithVelocity,
                                              QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window));
     QGuiApplication::processEvents();
     QQuickTouchUtils::flush(window);
     QCOMPARE(item->lastVelocity, transformedVelocity);
-    QPoint itemLocalPos = item->mapFromScene(points[0].pos()).toPoint();
-    QPoint itemLocalPosFromEvent = item->lastEvent.touchPoints[0].pos().toPoint();
+    QPoint itemLocalPos = item->mapFromScene(points[0].position()).toPoint();
+    QPoint itemLocalPosFromEvent = item->lastEvent.touchPoints[0].position().toPoint();
     QCOMPARE(itemLocalPos, itemLocalPosFromEvent);
 
     points[0].setState(Qt::TouchPointReleased);
@@ -1158,7 +1158,7 @@ void tst_qquickwindow::mouseFromTouch_basic()
     QCOMPARE(item->mousePressNum, 1);
     QCOMPARE(item->mouseMoveNum, 1);
     QCOMPARE(item->mouseReleaseNum, 1);
-    QCOMPARE(item->lastMousePos.toPoint(), item->mapFromScene(points[0].pos()).toPoint());
+    QCOMPARE(item->lastMousePos.toPoint(), item->mapFromScene(points[0].position()).toPoint());
     QCOMPARE(item->lastVelocityFromMouseMove, velocity);
     QVERIFY((item->lastMouseCapabilityFlags & QTouchDevice::Velocity) != 0);
 
@@ -1182,7 +1182,7 @@ void tst_qquickwindow::mouseFromTouch_basic()
                                              QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window));
     QGuiApplication::processEvents();
     QQuickTouchUtils::flush(window);
-    QCOMPARE(item->lastMousePos.toPoint(), item->mapFromScene(points[0].pos()).toPoint());
+    QCOMPARE(item->lastMousePos.toPoint(), item->mapFromScene(points[0].position()).toPoint());
     QCOMPARE(item->lastVelocityFromMouseMove, transformedVelocity);
 
     points[0].setState(Qt::TouchPointReleased);
@@ -2777,7 +2777,7 @@ public:
     bool childMouseEventFilter(QQuickItem *item, QEvent *event) override
     {
         Q_UNUSED(item)
-        if (event->type() == QEvent::MouseButtonPress && !contains(static_cast<QMouseEvent*>(event)->pos())) {
+        if (event->type() == QEvent::MouseButtonPress && !contains(static_cast<QMouseEvent*>(event)->position().toPoint())) {
             // This is an evil hack: in case of items that are not rectangles, we never accept the event.
             // Instead the events are now delivered to QDeclarativeGeoMapItemBase which doesn't to anything with them.
             // The map below it still works since it filters events and steals the events at some point.
@@ -2861,8 +2861,8 @@ void tst_qquickwindow::pointerEventTypeAndPointCount()
 //    QVERIFY(!pe->asTabletEvent()); // TODO
     QCOMPARE(pme.pointCount(), 1);
     QCOMPARE(pme.point(0)->scenePosition(), scenePosition);
-    QCOMPARE(pme.asMouseEvent(localPosition)->localPos(), localPosition);
-    QCOMPARE(pme.asMouseEvent(localPosition)->screenPos(), screenPosition);
+    QCOMPARE(pme.asMouseEvent(localPosition)->position(), localPosition);
+    QCOMPARE(pme.asMouseEvent(localPosition)->globalPosition(), screenPosition);
 
     QQuickPointerTouchEvent pte(nullptr, QQuickPointerDevice::touchDevice(touchDevice));
     pte.reset(&te);
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 7fccb895db..b0d31e9121 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -109,22 +109,22 @@ public:
     }
     void mousePressEvent(QMouseEvent *event)
     {
-        eventList.append(Event(event->type(), event->pos(), event->globalPos()));
+        eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint()));
         event->setAccepted(acceptMouse);
     }
     void mouseMoveEvent(QMouseEvent *event)
     {
-        eventList.append(Event(event->type(), event->pos(), event->globalPos()));
+        eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint()));
         event->setAccepted(acceptMouse);
     }
     void mouseReleaseEvent(QMouseEvent *event)
     {
-        eventList.append(Event(event->type(), event->pos(), event->globalPos()));
+        eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint()));
         event->setAccepted(acceptMouse);
     }
     void mouseDoubleClickEvent(QMouseEvent *event)
     {
-        eventList.append(Event(event->type(), event->pos(), event->globalPos()));
+        eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint()));
         event->setAccepted(acceptMouse);
     }
 
@@ -211,7 +211,7 @@ protected:
                 event->type() == QEvent::MouseMove ||
                 event->type() == QEvent::MouseButtonRelease) {
             QMouseEvent *me = static_cast<QMouseEvent*>(event);
-            filteredEventList.append(Event(me->type(), me->pos(), me->globalPos()));
+            filteredEventList.append(Event(me->type(), me->position().toPoint(), me->globalPosition().toPoint()));
         }
         return false;
     }
@@ -308,9 +308,9 @@ void tst_TouchMouse::simpleTouchEvent()
     QPoint localPos = eventItem1->mapFromScene(p1).toPoint();
     QPoint globalPos = window->mapToGlobal(p1);
     QPoint scenePos = p1; // item is at 0,0
-    QCOMPARE(eventItem1->eventList.at(0).points.at(0).pos().toPoint(), localPos);
-    QCOMPARE(eventItem1->eventList.at(0).points.at(0).scenePos().toPoint(), scenePos);
-    QCOMPARE(eventItem1->eventList.at(0).points.at(0).screenPos().toPoint(), globalPos);
+    QCOMPARE(eventItem1->eventList.at(0).points.at(0).position().toPoint(), localPos);
+    QCOMPARE(eventItem1->eventList.at(0).points.at(0).scenePosition().toPoint(), scenePos);
+    QCOMPARE(eventItem1->eventList.at(0).points.at(0).globalPosition().toPoint(), globalPos);
     if (synthMouse) {
         QCOMPARE(eventItem1->eventList.at(1).mousePos, localPos);
         QCOMPARE(eventItem1->eventList.at(1).mousePosGlobal, globalPos);