diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-08 09:37:59 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-11 18:52:07 +0000 |
commit | e481f1c414d7c243efabe4215b1865c616d25ce0 (patch) | |
tree | c6e577950cdebf7d4cf476062ab34407fafa0dc2 /src/quicktemplates2/qquickrangeslider.cpp | |
parent | 040c29bb91653a2adfa16a33781b3a2f7c29152d (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/qtquickcontrols2
$ find . -name "*.clazy.yaml"
$ clang-apply-replacements .
Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: I7fb9b0603341ea1a0c3a00f79ebd642a6354702d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
-rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 9ad12102..2b0f2961 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -1151,14 +1151,14 @@ void QQuickRangeSlider::hoverEnterEvent(QHoverEvent *event) { Q_D(QQuickRangeSlider); QQuickControl::hoverEnterEvent(event); - d->updateHover(event->posF()); + d->updateHover(event->position()); } void QQuickRangeSlider::hoverMoveEvent(QHoverEvent *event) { Q_D(QQuickRangeSlider); QQuickControl::hoverMoveEvent(event); - d->updateHover(event->posF()); + d->updateHover(event->position()); } void QQuickRangeSlider::hoverLeaveEvent(QHoverEvent *event) @@ -1181,7 +1181,7 @@ void QQuickRangeSlider::mousePressEvent(QMouseEvent *event) { Q_D(QQuickRangeSlider); QQuickControl::mousePressEvent(event); - d->handleMove(event->localPos()); + d->handleMove(event->position()); setKeepMouseGrab(true); } @@ -1197,20 +1197,20 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event) switch (point.state()) { case Qt::TouchPointPressed: - d->handlePress(point.pos()); + d->handlePress(point.position()); break; case Qt::TouchPointMoved: if (!keepTouchGrab()) { if (d->orientation == Qt::Horizontal) - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().x() - point.startPos().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - point.pressPosition().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold))); else - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().y() - point.startPos().y(), Qt::YAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().y() - point.pressPosition().y(), Qt::YAxis, &point, qRound(d->touchDragThreshold))); } if (keepTouchGrab()) - d->handleMove(point.pos()); + d->handleMove(point.position()); break; case Qt::TouchPointReleased: - d->handleRelease(point.pos()); + d->handleRelease(point.position()); break; default: break; |