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/qtwayland
$ find . -name "*.clazy.yaml"
$ clang-apply-replacements .

Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: If822ba409f974f737dc46ac31f6e8e92cc1603cc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 17 insertions, 17 deletions

diff --git a/examples/wayland/custom-extension/cpp-client/main.cpp b/examples/wayland/custom-extension/cpp-client/main.cpp
index 78eac44b9..e5f125f6e 100644
--- a/examples/wayland/custom-extension/cpp-client/main.cpp
+++ b/examples/wayland/custom-extension/cpp-client/main.cpp
@@ -137,22 +137,22 @@ protected:
 
     void mousePressEvent(QMouseEvent *ev) override
     {
-        if (rect1.contains(ev->pos()))
+        if (rect1.contains(ev->position()))
             doSpin();
-        else if (rect2.contains(ev->pos()))
+        else if (rect2.contains(ev->position()))
             doBounce();
-        else if (rect3.contains(ev->pos()))
+        else if (rect3.contains(ev->position()))
             newWindow();
-        else if (rect4.contains(ev->pos()))
+        else if (rect4.contains(ev->position()))
             newObject();
     }
 
 private:
     CustomExtension *m_extension = nullptr;
-    QRect rect1;
-    QRect rect2;
-    QRect rect3;
-    QRect rect4;
+    QRectF rect1;
+    QRectF rect2;
+    QRectF rect3;
+    QRectF rect4;
     QFont m_font;
     static int m_objectCount;
     static int m_hue;
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
index 5a6ab44bc..56caf05e2 100644
--- a/src/client/qwaylandcursor.cpp
+++ b/src/client/qwaylandcursor.cpp
@@ -270,7 +270,7 @@ void QWaylandCursor::changeCursor(QCursor *cursor, QWindow *window)
 
 void QWaylandCursor::pointerEvent(const QMouseEvent &event)
 {
-    mLastPos = event.globalPos();
+    mLastPos = event.globalPosition().toPoint();
 }
 
 QPoint QWaylandCursor::pos() const
diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index 87edaf9da..b83d70b77 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -217,7 +217,7 @@ void QWaylandTouch::sendFullTouchEvent(QWaylandSurface *surface, QTouchEvent *ev
         const QTouchEvent::TouchPoint &tp(points.at(i));
         // Convert the local pos in the compositor window to surface-relative.
         const int id = d->toSequentialWaylandId(tp.id());
-        sendTouchPointEvent(surface, id, tp.pos(), tp.state());
+        sendTouchPointEvent(surface, id, tp.position(), tp.state());
         if (tp.state() == Qt::TouchPointReleased)
             d->ids[id] = -1;
     }
diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp
index ca92cc2c8..032545db6 100644
--- a/src/compositor/extensions/qwlqttouch.cpp
+++ b/src/compositor/extensions/qwlqttouch.cpp
@@ -91,8 +91,8 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s
             uint32_t state = (tp.state() & 0xFFFF) | (sentPointCount << 16);
             uint32_t flags = (tp.flags() & 0xFFFF) | (int(event->pointingDevice()->capabilities()) << 16);
 
-            int x = toFixed(tp.pos().x());
-            int y = toFixed(tp.pos().y());
+            int x = toFixed(tp.position().x());
+            int y = toFixed(tp.position().y());
             int nx = toFixed(tp.normalizedPos().x());
             int ny = toFixed(tp.normalizedPos().y());
             int w = toFixed(tp.ellipseDiameters().width());
diff --git a/src/imports/compositor/qwaylandmousetracker.cpp b/src/imports/compositor/qwaylandmousetracker.cpp
index e7af567af..c195f03c0 100644
--- a/src/imports/compositor/qwaylandmousetracker.cpp
+++ b/src/imports/compositor/qwaylandmousetracker.cpp
@@ -128,10 +128,10 @@ bool QWaylandMouseTracker::childMouseEventFilter(QQuickItem *item, QEvent *event
     Q_D(QWaylandMouseTracker);
     if (event->type() == QEvent::MouseMove) {
         QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
-        d->handleMousePos(mapFromItem(item, mouseEvent->localPos()));
+        d->handleMousePos(mapFromItem(item, mouseEvent->position()));
     } else if (event->type() == QEvent::HoverMove) {
         QHoverEvent *hoverEvent = static_cast<QHoverEvent *>(event);
-        d->handleMousePos(mapFromItem(item, hoverEvent->posF()));
+        d->handleMousePos(mapFromItem(item, hoverEvent->position()));
     }
     return false;
 }
@@ -140,14 +140,14 @@ void QWaylandMouseTracker::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QWaylandMouseTracker);
     QQuickItem::mouseMoveEvent(event);
-    d->handleMousePos(event->localPos());
+    d->handleMousePos(event->position());
 }
 
 void QWaylandMouseTracker::hoverMoveEvent(QHoverEvent *event)
 {
     Q_D(QWaylandMouseTracker);
     QQuickItem::hoverMoveEvent(event);
-    d->handleMousePos(event->posF());
+    d->handleMousePos(event->position());
 }
 
 void QWaylandMouseTracker::hoverEnterEvent(QHoverEvent *event)
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 42e23b54c..ad63eca0a 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -81,7 +81,7 @@ public:
     void mousePressEvent(QMouseEvent *event) override
     {
         ++mousePressEventCount;
-        mousePressPos = event->pos();
+        mousePressPos = event->position().toPoint();
     }
 
     void mouseReleaseEvent(QMouseEvent *) override