diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-08 09:21:58 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-11 22:00:19 +0200 |
commit | 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad (patch) | |
tree | a9e5265252c2ccfead34d4e42fe8149358bff0f1 /src/quick/items/qquickpathview.cpp | |
parent | 974c8da34d79cd8fc417ff5d69bc00c1e910e5ac (diff) |
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>
Diffstat (limited to 'src/quick/items/qquickpathview.cpp')
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 4a8089f49c..4860378957 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -1657,16 +1657,16 @@ void QQuickPathViewPrivate::handleMousePressEvent(QMouseEvent *event) int idx = 0; for (; idx < items.count(); ++idx) { QQuickItem *item = items.at(idx); - if (item->contains(item->mapFromScene(event->windowPos()))) + if (item->contains(item->mapFromScene(event->scenePosition()))) break; } if (idx == items.count() && qFuzzyIsNull(dragMargin)) // didn't click on an item return; - startPoint = pointNear(event->localPos(), &startPc); - startPos = event->localPos(); + startPoint = pointNear(event->position(), &startPc); + startPos = event->position(); if (idx == items.count()) { - qreal distance = qAbs(event->localPos().x() - startPoint.x()) + qAbs(event->localPos().y() - startPoint.y()); + qreal distance = qAbs(event->position().x() - startPoint.x()) + qAbs(event->position().y() - startPoint.y()); if (distance > dragMargin) return; } @@ -1703,9 +1703,9 @@ void QQuickPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event) qint64 currentTimestamp = computeCurrentTime(event); qreal newPc; - QPointF pathPoint = pointNear(event->localPos(), &newPc); + QPointF pathPoint = pointNear(event->position(), &newPc); if (!stealMouse) { - QPointF posDelta = event->localPos() - startPos; + QPointF posDelta = event->position() - startPos; if (QQuickWindowPrivate::dragOverThreshold(posDelta.y(), Qt::YAxis, event) || QQuickWindowPrivate::dragOverThreshold(posDelta.x(), Qt::XAxis, event)) { // The touch has exceeded the threshold. If the movement along the path is close to the drag threshold // then we'll assume that this gesture targets the PathView. This ensures PathView gesture grabbing @@ -1840,7 +1840,7 @@ void QQuickPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *event) bool QQuickPathView::sendMouseEvent(QMouseEvent *event) { Q_D(QQuickPathView); - QPointF localPos = mapFromScene(event->windowPos()); + QPointF localPos = mapFromScene(event->scenePosition()); QQuickWindow *c = window(); QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr; |