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/widgets/tablet | |
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/widgets/tablet')
-rw-r--r-- | examples/widgets/widgets/tablet/tabletcanvas.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/widgets/tablet/tabletcanvas.cpp b/examples/widgets/widgets/tablet/tabletcanvas.cpp index 90a5017500..f3f2b0cac6 100644 --- a/examples/widgets/widgets/tablet/tabletcanvas.cpp +++ b/examples/widgets/widgets/tablet/tabletcanvas.cpp @@ -99,7 +99,7 @@ void TabletCanvas::tabletEvent(QTabletEvent *event) case QEvent::TabletPress: if (!m_deviceDown) { m_deviceDown = true; - lastPoint.pos = event->posF(); + lastPoint.pos = event->position(); lastPoint.pressure = event->pressure(); lastPoint.rotation = event->rotation(); } @@ -113,7 +113,7 @@ void TabletCanvas::tabletEvent(QTabletEvent *event) updateBrush(event); QPainter painter(&m_pixmap); paintPixmap(painter, event); - lastPoint.pos = event->posF(); + lastPoint.pos = event->position(); lastPoint.pressure = event->pressure(); lastPoint.rotation = event->rotation(); } @@ -173,8 +173,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) grad.setColorAt(0.5, Qt::transparent); painter.setBrush(grad); qreal radius = grad.radius(); - painter.drawEllipse(event->posF(), radius, radius); - update(QRect(event->pos() - QPoint(radius, radius), QSize(radius * 2, radius * 2))); + painter.drawEllipse(event->position(), radius, radius); + update(QRect(event->position().toPoint() - QPoint(radius, radius), QSize(radius * 2, radius * 2))); } break; case QTabletEvent::RotationStylus: @@ -191,8 +191,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) halfWidth = m_pen.widthF(); brushAdjust = QPointF(qSin(qDegreesToRadians(-event->rotation())) * halfWidth, qCos(qDegreesToRadians(-event->rotation())) * halfWidth); - poly << event->posF() - brushAdjust; - poly << event->posF() + brushAdjust; + poly << event->position() - brushAdjust; + poly << event->position() + brushAdjust; painter.drawConvexPolygon(poly); update(poly.boundingRect().toRect()); } @@ -223,8 +223,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) Q_FALLTHROUGH(); case QTabletEvent::Stylus: painter.setPen(m_pen); - painter.drawLine(lastPoint.pos, event->posF()); - update(QRect(lastPoint.pos.toPoint(), event->pos()).normalized() + painter.drawLine(lastPoint.pos, event->position()); + update(QRect(lastPoint.pos.toPoint(), event->position().toPoint()).normalized() .adjusted(-maxPenRadius, -maxPenRadius, maxPenRadius, maxPenRadius)); break; } |