diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-08 09:21:58 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-11 22:00:19 +0200 |
commit | 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad (patch) | |
tree | a9e5265252c2ccfead34d4e42fe8149358bff0f1 /src/quick/items/qquickmultipointtoucharea.cpp | |
parent | 974c8da34d79cd8fc417ff5d69bc00c1e910e5ac (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/qtdeclarative
$ find . -name "*.clazy.yaml"
$ clang-apply-replacements .
Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: I1be5819506fd5039e86b4494223acbe193e6b0c9
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
-rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 383718c979..d2fc476038 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -592,9 +592,9 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) case QEvent::MouseMove: case QEvent::MouseButtonRelease: { QMouseEvent *me = static_cast<QMouseEvent*>(event); - _mouseQpaTouchPoint.setPos(me->localPos()); - _mouseQpaTouchPoint.setScenePos(me->windowPos()); - _mouseQpaTouchPoint.setScreenPos(me->screenPos()); + _mouseQpaTouchPoint.setPos(me->position()); + _mouseQpaTouchPoint.setScenePos(me->scenePosition()); + _mouseQpaTouchPoint.setScreenPos(me->globalPosition()); if (event->type() == QEvent::MouseMove) _mouseQpaTouchPoint.setState(Qt::TouchPointMoved); else if (event->type() == QEvent::MouseButtonRelease) @@ -602,9 +602,9 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) else { // QEvent::MouseButtonPress addTouchPoint(me); started = true; - _mouseQpaTouchPoint.setStartPos(me->localPos()); - _mouseQpaTouchPoint.setStartScenePos(me->windowPos()); - _mouseQpaTouchPoint.setStartScreenPos(me->screenPos()); + _mouseQpaTouchPoint.setStartPos(me->position()); + _mouseQpaTouchPoint.setStartScenePos(me->scenePosition()); + _mouseQpaTouchPoint.setStartScreenPos(me->globalPosition()); _mouseQpaTouchPoint.setState(Qt::TouchPointPressed); } touchPoints << _mouseQpaTouchPoint; @@ -662,8 +662,8 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) for (const QTouchEvent::TouchPoint &p : qAsConst(touchPoints)) { if (p.state() == Qt::TouchPointReleased) continue; - const QPointF ¤tPos = p.scenePos(); - const QPointF &startPos = p.startScenePos(); + const QPointF ¤tPos = p.scenePosition(); + const QPointF &startPos = p.scenePressPosition(); if (qAbs(currentPos.x() - startPos.x()) > dragThreshold) offerGrab = true; else if (qAbs(currentPos.y() - startPos.y()) > dragThreshold) @@ -784,33 +784,33 @@ void QQuickMultiPointTouchArea::updateTouchPoint(QQuickTouchPoint *dtp, const QT //TODO: if !qmlDefined, could bypass setters. // also, should only emit signals after all values have been set dtp->setUniqueId(p->uniqueId()); - dtp->setPosition(p->pos()); + dtp->setPosition(p->position()); dtp->setEllipseDiameters(p->ellipseDiameters()); dtp->setPressure(p->pressure()); dtp->setRotation(p->rotation()); dtp->setVelocity(p->velocity()); QRectF area(QPointF(), p->ellipseDiameters()); - area.moveCenter(p->pos()); + area.moveCenter(p->position()); dtp->setArea(area); - dtp->setStartX(p->startPos().x()); - dtp->setStartY(p->startPos().y()); + dtp->setStartX(p->pressPosition().x()); + dtp->setStartY(p->pressPosition().y()); dtp->setPreviousX(p->lastPos().x()); dtp->setPreviousY(p->lastPos().y()); - dtp->setSceneX(p->scenePos().x()); - dtp->setSceneY(p->scenePos().y()); + dtp->setSceneX(p->scenePosition().x()); + dtp->setSceneY(p->scenePosition().y()); } void QQuickMultiPointTouchArea::updateTouchPoint(QQuickTouchPoint *dtp, const QMouseEvent *e) { dtp->setPreviousX(dtp->x()); dtp->setPreviousY(dtp->y()); - dtp->setPosition(e->localPos()); + dtp->setPosition(e->position()); if (e->type() == QEvent::MouseButtonPress) { - dtp->setStartX(e->localPos().x()); - dtp->setStartY(e->localPos().y()); + dtp->setStartX(e->position().x()); + dtp->setStartY(e->position().y()); } - dtp->setSceneX(e->windowPos().x()); - dtp->setSceneY(e->windowPos().y()); + dtp->setSceneX(e->scenePosition().x()); + dtp->setSceneY(e->scenePosition().y()); } void QQuickMultiPointTouchArea::mousePressEvent(QMouseEvent *event) @@ -823,7 +823,7 @@ void QQuickMultiPointTouchArea::mousePressEvent(QMouseEvent *event) _stealMouse = false; setKeepMouseGrab(false); event->setAccepted(true); - _mousePos = event->localPos(); + _mousePos = event->position(); if (event->source() != Qt::MouseEventNotSynthesized && event->source() != Qt::MouseEventSynthesizedByQt) return; @@ -904,13 +904,13 @@ void QQuickMultiPointTouchArea::touchUngrabEvent() bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event) { - QPointF localPos = mapFromScene(event->windowPos()); + QPointF localPos = mapFromScene(event->scenePosition()); QQuickWindow *c = window(); QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr; bool stealThisEvent = _stealMouse; if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab())) { - QMouseEvent mouseEvent(event->type(), localPos, event->windowPos(), event->screenPos(), + QMouseEvent mouseEvent(event->type(), localPos, event->scenePosition(), event->globalPosition(), event->button(), event->buttons(), event->modifiers()); mouseEvent.setAccepted(false); QGuiApplicationPrivate::setMouseEventCapsAndVelocity(&mouseEvent, @@ -1000,7 +1000,7 @@ bool QQuickMultiPointTouchArea::shouldFilter(QEvent *event) case QEvent::MouseMove: case QEvent::MouseButtonRelease: { QMouseEvent *me = static_cast<QMouseEvent*>(event); - containsPoint = contains(mapFromScene(me->windowPos())); + containsPoint = contains(mapFromScene(me->scenePosition())); } break; case QEvent::TouchBegin: @@ -1008,7 +1008,7 @@ bool QQuickMultiPointTouchArea::shouldFilter(QEvent *event) case QEvent::TouchEnd: { QTouchEvent *te = static_cast<QTouchEvent*>(event); for (const QTouchEvent::TouchPoint &point : te->touchPoints()) { - if (contains(mapFromScene(point.scenePos()))) { + if (contains(mapFromScene(point.scenePosition()))) { containsPoint = true; break; } |