diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-07-17 10:52:46 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-08-11 16:00:42 +0200 |
| commit | b348cac075ad4ad39cb941a325671909a9ce2692 (patch) | |
| tree | 62ac0707ace4657176dbb91dec250f3dde9e418d /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | 343572a86dbc0543d51e2fc5df6924d15d9d008f (diff) | |
Fix event refactoring warnings and errors
Change-Id: I426b4f75066c9db72759398e4d76fd5323044d57
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 2b0f2961..af95d463 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -458,7 +458,7 @@ bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) int firstId = QQuickRangeSliderNodePrivate::get(first)->touchId; int secondId = QQuickRangeSliderNodePrivate::get(second)->touchId; - if (((firstId == -1 || secondId == -1) && point.state() == Qt::TouchPointPressed) || point.id() == firstId || point.id() == secondId) { + if (((firstId == -1 || secondId == -1) && point.state() == QEventPoint::Pressed) || point.id() == firstId || point.id() == secondId) { touchId = point.id(); return true; } @@ -1196,10 +1196,10 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event) continue; switch (point.state()) { - case Qt::TouchPointPressed: + case QEventPoint::Pressed: d->handlePress(point.position()); break; - case Qt::TouchPointMoved: + case QEventPoint::Updated: if (!keepTouchGrab()) { if (d->orientation == Qt::Horizontal) setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - point.pressPosition().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold))); @@ -1209,7 +1209,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event) if (keepTouchGrab()) d->handleMove(point.position()); break; - case Qt::TouchPointReleased: + case QEventPoint::Released: d->handleRelease(point.position()); break; default: |