diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-16 11:29:12 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-17 09:18:11 +0200 |
commit | 6a4aa096e9b9af08a81fe020d7f2ec8ceab7dfa6 (patch) | |
tree | 6f1947836a76418943b1d9e2596026e2e9c8e85b /examples/widgets/painting/pathstroke/pathstroke.cpp | |
parent | 7709463b55636305e6b35dccaf6c403fa5c3d72d (diff) |
Port examples away from deprecated QTouchEvent APIs
Use the QEventPoints API instead.
Change-Id: I7310fd34df110cad508f6188a41ad452a3cf848d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'examples/widgets/painting/pathstroke/pathstroke.cpp')
-rw-r--r-- | examples/widgets/painting/pathstroke/pathstroke.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/painting/pathstroke/pathstroke.cpp b/examples/widgets/painting/pathstroke/pathstroke.cpp index 412c2da6a4..bfa588f201 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.cpp +++ b/examples/widgets/painting/pathstroke/pathstroke.cpp @@ -622,11 +622,11 @@ bool PathStrokeRenderer::event(QEvent *e) case QEvent::TouchUpdate: { const QTouchEvent *const event = static_cast<const QTouchEvent*>(e); - const QList<QTouchEvent::TouchPoint> points = event->touchPoints(); - for (const QTouchEvent::TouchPoint &touchPoint : points) { - const int id = touchPoint.id(); - switch (touchPoint.state()) { - case Qt::TouchPointPressed: + const auto points = event->points(); + for (const auto &point : points) { + const int id = point.id(); + switch (point.state()) { + case QEventPoint::Pressed: { // find the point, move it const auto mappedPoints = m_fingerPointMapping.values(); @@ -638,32 +638,32 @@ bool PathStrokeRenderer::event(QEvent *e) if (activePoints.contains(i)) continue; - qreal d = QLineF(touchPoint.position(), m_points.at(i)).length(); + qreal d = QLineF(point.position(), m_points.at(i)).length(); if ((distance < 0 && d < 12 * m_pointSize) || d < distance) { distance = d; activePoint = i; } } if (activePoint != -1) { - m_fingerPointMapping.insert(touchPoint.id(), activePoint); - m_points[activePoint] = touchPoint.position(); + m_fingerPointMapping.insert(point.id(), activePoint); + m_points[activePoint] = point.position(); } break; } - case Qt::TouchPointReleased: + case QEventPoint::Released: { // move the point and release QHash<int,int>::iterator it = m_fingerPointMapping.find(id); - m_points[it.value()] = touchPoint.position(); + m_points[it.value()] = point.position(); m_fingerPointMapping.erase(it); break; } - case Qt::TouchPointMoved: + case QEventPoint::Updated: { // move the point const int pointIdx = m_fingerPointMapping.value(id, -1); if (pointIdx >= 0) - m_points[pointIdx] = touchPoint.position(); + m_points[pointIdx] = point.position(); break; } default: |