diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-04 18:07:06 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-08 19:11:51 +0200 |
commit | a061a646429c6e9d695458fc0ecb0021a30e12ee (patch) | |
tree | 7ba6fce7ee7c8975b0c50e31195bd02c5419fc15 /examples/widgets/touch | |
parent | 24e52c10deedbaef833c0e2c3ee7bee03eacc4f5 (diff) |
Replace calls to deprecated QEvent accessor functions
Many of these were generated by clazy using the new qevent-accessors check.
Change-Id: Ie17af17f50fdc9f47d7859d267c14568cc350fd0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/widgets/touch')
-rw-r--r-- | examples/widgets/touch/fingerpaint/scribblearea.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/knob.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/graphicsview.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp index 4af0ec8e7e..ed06545b43 100644 --- a/examples/widgets/touch/fingerpaint/scribblearea.cpp +++ b/examples/widgets/touch/fingerpaint/scribblearea.cpp @@ -216,13 +216,13 @@ bool ScribbleArea::event(QEvent *event) QPainter painter(&image); painter.setPen(Qt::NoPen); painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count())); - painter.drawEllipse(touchPoint.pos(), diams.width() / 2, diams.height() / 2); + painter.drawEllipse(touchPoint.position(), diams.width() / 2, diams.height() / 2); painter.end(); modified = true; const int rad = 2; QRectF rect(QPointF(), diams); - rect.moveCenter(touchPoint.pos()); + rect.moveCenter(touchPoint.position()); update(rect.toRect().adjusted(-rad,-rad, +rad, +rad)); } break; diff --git a/examples/widgets/touch/knobs/knob.cpp b/examples/widgets/touch/knobs/knob.cpp index 12aaa1e948..659ba82f45 100644 --- a/examples/widgets/touch/knobs/knob.cpp +++ b/examples/widgets/touch/knobs/knob.cpp @@ -82,7 +82,7 @@ bool Knob::sceneEvent(QEvent *event) const QTouchEvent::TouchPoint &touchPoint2 = touchEvent->touchPoints().last(); QLineF line1(touchPoint1.lastScenePos(), touchPoint2.lastScenePos()); - QLineF line2(touchPoint1.scenePos(), touchPoint2.scenePos()); + QLineF line2(touchPoint1.scenePosition(), touchPoint2.scenePosition()); setTransform(QTransform().rotate(line2.angleTo(line1)), true); } diff --git a/examples/widgets/touch/pinchzoom/graphicsview.cpp b/examples/widgets/touch/pinchzoom/graphicsview.cpp index 6412f350a7..e1ce42f93f 100644 --- a/examples/widgets/touch/pinchzoom/graphicsview.cpp +++ b/examples/widgets/touch/pinchzoom/graphicsview.cpp @@ -74,8 +74,8 @@ bool GraphicsView::viewportEvent(QEvent *event) const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); qreal currentScaleFactor = - QLineF(touchPoint0.pos(), touchPoint1.pos()).length() - / QLineF(touchPoint0.startPos(), touchPoint1.startPos()).length(); + QLineF(touchPoint0.position(), touchPoint1.position()).length() + / QLineF(touchPoint0.pressPosition(), touchPoint1.pressPosition()).length(); if (touchEvent->touchPointStates() & Qt::TouchPointReleased) { // if one of the fingers is released, remember the current scale // factor so that adding another finger later will continue zooming |