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 /tests/auto/quick/touchmouse | |
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 'tests/auto/quick/touchmouse')
-rw-r--r-- | tests/auto/quick/touchmouse/tst_touchmouse.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index 7fccb895db..b0d31e9121 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -109,22 +109,22 @@ public: } void mousePressEvent(QMouseEvent *event) { - eventList.append(Event(event->type(), event->pos(), event->globalPos())); + eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint())); event->setAccepted(acceptMouse); } void mouseMoveEvent(QMouseEvent *event) { - eventList.append(Event(event->type(), event->pos(), event->globalPos())); + eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint())); event->setAccepted(acceptMouse); } void mouseReleaseEvent(QMouseEvent *event) { - eventList.append(Event(event->type(), event->pos(), event->globalPos())); + eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint())); event->setAccepted(acceptMouse); } void mouseDoubleClickEvent(QMouseEvent *event) { - eventList.append(Event(event->type(), event->pos(), event->globalPos())); + eventList.append(Event(event->type(), event->position().toPoint(), event->globalPosition().toPoint())); event->setAccepted(acceptMouse); } @@ -211,7 +211,7 @@ protected: event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) { QMouseEvent *me = static_cast<QMouseEvent*>(event); - filteredEventList.append(Event(me->type(), me->pos(), me->globalPos())); + filteredEventList.append(Event(me->type(), me->position().toPoint(), me->globalPosition().toPoint())); } return false; } @@ -308,9 +308,9 @@ void tst_TouchMouse::simpleTouchEvent() QPoint localPos = eventItem1->mapFromScene(p1).toPoint(); QPoint globalPos = window->mapToGlobal(p1); QPoint scenePos = p1; // item is at 0,0 - QCOMPARE(eventItem1->eventList.at(0).points.at(0).pos().toPoint(), localPos); - QCOMPARE(eventItem1->eventList.at(0).points.at(0).scenePos().toPoint(), scenePos); - QCOMPARE(eventItem1->eventList.at(0).points.at(0).screenPos().toPoint(), globalPos); + QCOMPARE(eventItem1->eventList.at(0).points.at(0).position().toPoint(), localPos); + QCOMPARE(eventItem1->eventList.at(0).points.at(0).scenePosition().toPoint(), scenePos); + QCOMPARE(eventItem1->eventList.at(0).points.at(0).globalPosition().toPoint(), globalPos); if (synthMouse) { QCOMPARE(eventItem1->eventList.at(1).mousePos, localPos); QCOMPARE(eventItem1->eventList.at(1).mousePosGlobal, globalPos); |