From b537fd6a1845871f21da88fa2c568a46750d0a90 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 6 Jan 2022 22:49:08 +0100 Subject: [PATCH] Remove uses of QMutableSinglePointEvent::mutablePoint() Use the static setters of QMutableEventPoint instead. Task-number: QTBUG-99615 Pick-to: 6.3 Change-Id: Ibdaf485aff2c1638f500b708d61eeabd79836486 Reviewed-by: Fabian Kosmale --- src/quick/items/qquickmultipointtoucharea.cpp | 6 +++--- src/quicktemplates2/qquickswipedelegate.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 642b5ca047..548a92901d 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -910,8 +910,8 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event) bool stealThisEvent = _stealMouse; if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab())) { QMutableSinglePointEvent mouseEvent(*event); - const auto oldPosition = mouseEvent.mutablePoint().position(); - mouseEvent.mutablePoint().setPosition(localPos); + const auto oldPosition = mouseEvent.position(); + QMutableEventPoint::setPosition(mouseEvent.point(0), localPos); mouseEvent.setSource(Qt::MouseEventSynthesizedByQt); mouseEvent.setAccepted(false); QMouseEvent *pmouseEvent = static_cast(static_cast(&mouseEvent)); @@ -933,7 +933,7 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event) if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) grabMouse(); - mouseEvent.mutablePoint().setPosition(oldPosition); + QMutableEventPoint::setPosition(mouseEvent.point(0), oldPosition); return stealThisEvent; } if (event->type() == QEvent::MouseButtonRelease) { diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 2fb0ecc12c..d4be51399b 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -961,7 +961,7 @@ void QQuickSwipeDelegatePrivate::forwardMouseEvent(QMouseEvent *event, QQuickIte { Q_Q(QQuickSwipeDelegate); QMutableSinglePointEvent localizedEvent(*event); - localizedEvent.mutablePoint().setPosition(localPos); + QMutableEventPoint::setPosition(localizedEvent.point(0), localPos); QGuiApplication::sendEvent(destination, &localizedEvent); q->setPressed(!localizedEvent.isAccepted()); }