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

Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: Ic08d1f0bc4f14c6477a44d911e54700e8ced17a9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

4 files changed, 26 insertions, 26 deletions

diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index a9e80f2d3..abe433362 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -566,7 +566,7 @@ void DeviceSkin::mousePressEvent( QMouseEvent *e )
         const int numAreas = m_parameters.buttonAreas.size();
         for (int i = 0; i < numAreas ; i++) {
             const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[i];
-            if (  buttonRegions[i].contains( e->pos() ) ) {
+            if (  buttonRegions[i].contains( e->position().toPoint() ) ) {
                 if ( flipped_open || ba.activeWhenClosed ) {
                     if ( m_parameters.joystick == i ) {
                         joydown = true;
@@ -582,11 +582,11 @@ void DeviceSkin::mousePressEvent( QMouseEvent *e )
                 }
             }
         }
-        clickPos = e->pos();
+        clickPos = e->position().toPoint();
 //      This is handy for finding the areas to define rectangles for new skins
         if (debugDeviceSkin)
-            qDebug()<< "Clicked in " <<  e->pos().x() << ',' <<  e->pos().y();
-        clickPos = e->pos();
+            qDebug()<< "Clicked in " <<  e->position().toPoint().x() << ',' <<  e->position().toPoint().y();
+        clickPos = e->position().toPoint();
     }
 }
 
@@ -643,7 +643,7 @@ void DeviceSkin::mouseMoveEvent( QMouseEvent *e )
 {
     if ( e->buttons() & Qt::LeftButton ) {
         const int joystick = m_parameters.joystick;
-        QPoint newpos =  e->globalPos() - clickPos;
+        QPoint newpos =  e->globalPosition().toPoint() - clickPos;
         if (joydown) {
             int k1=0, k2=0;
             if (newpos.x() < -joydistance) {
@@ -675,7 +675,7 @@ void DeviceSkin::mouseMoveEvent( QMouseEvent *e )
         }
     }
     if ( cursorw )
-        cursorw->setPos(e->globalPos());
+        cursorw->setPos(e->globalPosition().toPoint());
 }
 
 void DeviceSkin::moveParent()
@@ -727,7 +727,7 @@ bool CursorWindow::handleMouseEvent(QEvent *ev)
         if (m_view) {
             if (ev->type() >= QEvent::MouseButtonPress && ev->type() <= QEvent::MouseMove) {
                 QMouseEvent *e = (QMouseEvent*)ev;
-                QPoint gp = e->globalPos();
+                QPoint gp = e->globalPosition().toPoint();
                 QPoint vp = m_view->mapFromGlobal(gp);
                 QPoint sp = skin->mapFromGlobal(gp);
                 if (e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick) {
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index 5e0f0e025..d47a2b1b9 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -916,7 +916,7 @@ void QtColorLinePrivate::mousePressEvent(QMouseEvent *event)
         return;
 
     QList<QRect> r = rects(m_point);
-    QPoint clickPos = event->pos();
+    QPoint clickPos = event->position().toPoint();
 
     QPoint posOnField = r[1].topLeft() - QPoint(m_indicatorSpace, m_indicatorSpace);
     m_clickOffset = posOnField - clickPos;
@@ -931,7 +931,7 @@ void QtColorLinePrivate::mouseMoveEvent(QMouseEvent *event)
 {
     if (!m_dragging)
         return;
-    QPoint newPos = event->pos();
+    QPoint newPos = event->position().toPoint();
 
     QSize fieldSize = q_ptr->geometry().size() -
             QSize(m_indicatorSize + 2 * m_indicatorSpace - 1, m_indicatorSize + 2 * m_indicatorSpace - 1);
@@ -970,7 +970,7 @@ void QtColorLinePrivate::mouseDoubleClickEvent(QMouseEvent *event)
         return;
 
     QList<QRect> r = rects(m_point);
-    QPoint clickPos = event->pos();
+    QPoint clickPos = event->position().toPoint();
     if (!r[0].contains(clickPos) && !r[2].contains(clickPos))
         return;
     QPoint newPosOnField = clickPos;
diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
index 49569869e..02c6434fe 100644
--- a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
@@ -471,8 +471,8 @@ void QtGradientStopsWidget::mousePressEvent(QMouseEvent *e)
 
     d_ptr->m_moveStops.clear();
     d_ptr->m_moveOriginal.clear();
-    d_ptr->m_clickPos = e->pos();
-    QtGradientStop *stop = d_ptr->stopAt(e->pos());
+    d_ptr->m_clickPos = e->position().toPoint();
+    QtGradientStop *stop = d_ptr->stopAt(e->position().toPoint());
     if (stop) {
         if (e->modifiers() & Qt::ControlModifier) {
             d_ptr->m_model->selectStop(stop, !d_ptr->m_model->isSelected(stop));
@@ -498,7 +498,7 @@ void QtGradientStopsWidget::mousePressEvent(QMouseEvent *e)
                 d_ptr->m_model->selectStop(stop, true);
             }
         }
-        d_ptr->setupMove(stop, e->pos().x());
+        d_ptr->setupMove(stop, e->position().toPoint().x());
     } else {
         d_ptr->m_model->clearSelection();
         d_ptr->m_rubber->setGeometry(QRect(d_ptr->m_clickPos, QSize()));
@@ -561,7 +561,7 @@ void QtGradientStopsWidget::mouseMoveEvent(QMouseEvent *e)
 
         PositionStopMap newPositions;
 
-        int viewportX = e->pos().x() - d_ptr->m_moveOffset;
+        int viewportX = e->position().toPoint().x() - d_ptr->m_moveOffset;
 
         if (viewportX > viewport()->size().width())
             viewportX = viewport()->size().width();
@@ -619,20 +619,20 @@ void QtGradientStopsWidget::mouseMoveEvent(QMouseEvent *e)
         }
 
     } else {
-        QRect r(QRect(d_ptr->m_clickPos, e->pos()).normalized());
+        QRect r(QRect(d_ptr->m_clickPos, e->position().toPoint()).normalized());
         r.translate(1, 0);
         d_ptr->m_rubber->setGeometry(r);
         //d_ptr->m_model->clearSelection();
 
         int xv1 = d_ptr->m_clickPos.x();
-        int xv2 = e->pos().x();
+        int xv2 = e->position().toPoint().x();
         if (xv1 > xv2) {
             int temp = xv1;
             xv1 = xv2;
             xv2 = temp;
         }
         int yv1 = d_ptr->m_clickPos.y();
-        int yv2 = e->pos().y();
+        int yv2 = e->position().toPoint().y();
         if (yv1 > yv2) {
             int temp = yv1;
             yv1 = yv2;
@@ -676,7 +676,7 @@ void QtGradientStopsWidget::mouseDoubleClickEvent(QMouseEvent *e)
     if (e->button() != Qt::LeftButton)
         return;
 
-    if (d_ptr->m_clickPos != e->pos()) {
+    if (d_ptr->m_clickPos != e->position().toPoint()) {
         mousePressEvent(e);
         return;
     }
@@ -684,7 +684,7 @@ void QtGradientStopsWidget::mouseDoubleClickEvent(QMouseEvent *e)
     d_ptr->m_moveStops.clear();
     d_ptr->m_moveOriginal.clear();
 
-    QtGradientStop *stop = d_ptr->newStop(e->pos());
+    QtGradientStop *stop = d_ptr->newStop(e->position().toPoint());
 
     if (!stop)
         return;
@@ -692,7 +692,7 @@ void QtGradientStopsWidget::mouseDoubleClickEvent(QMouseEvent *e)
     d_ptr->m_model->clearSelection();
     d_ptr->m_model->selectStop(stop, true);
 
-    d_ptr->setupMove(stop, e->pos().x());
+    d_ptr->setupMove(stop, e->position().toPoint().x());
 
     viewport()->update();
 }
@@ -1006,13 +1006,13 @@ void QtGradientStopsWidget::dragMoveEvent(QDragMoveEvent *event)
 {
     QRectF rect = viewport()->rect();
     rect.adjust(0, d_ptr->m_handleSize, 0, 0);
-    double x = d_ptr->fromViewport(event->pos().x());
-    QtGradientStop *dragStop = d_ptr->stopAt(event->pos());
+    double x = d_ptr->fromViewport(event->position().toPoint().x());
+    QtGradientStop *dragStop = d_ptr->stopAt(event->position().toPoint());
     if (dragStop) {
         event->accept();
         d_ptr->removeClonedStop();
         d_ptr->changeStop(dragStop->position());
-    } else if (rect.contains(event->pos())) {
+    } else if (rect.contains(event->position().toPoint())) {
         event->accept();
         if (d_ptr->m_model->at(x)) {
             d_ptr->removeClonedStop();
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index 318686952..fb77ee6eb 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -197,15 +197,15 @@ void QtPropertyEditorView::keyPressEvent(QKeyEvent *event)
 void QtPropertyEditorView::mousePressEvent(QMouseEvent *event)
 {
     QTreeWidget::mousePressEvent(event);
-    QTreeWidgetItem *item = itemAt(event->pos());
+    QTreeWidgetItem *item = itemAt(event->position().toPoint());
 
     if (item) {
         if ((item != m_editorPrivate->editedItem()) && (event->button() == Qt::LeftButton)
-                && (header()->logicalIndexAt(event->pos().x()) == 1)
+                && (header()->logicalIndexAt(event->position().toPoint().x()) == 1)
                 && ((item->flags() & (Qt::ItemIsEditable | Qt::ItemIsEnabled)) == (Qt::ItemIsEditable | Qt::ItemIsEnabled))) {
             editItem(item, 1);
         } else if (!m_editorPrivate->hasValue(item) && m_editorPrivate->markPropertiesWithoutValue() && !rootIsDecorated()) {
-            if (event->pos().x() + header()->offset() < 20)
+            if (event->position().toPoint().x() + header()->offset() < 20)
                 item->setExpanded(!item->isExpanded());
         }
     }