diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-08 09:37:59 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-11 18:52:07 +0000 |
commit | e481f1c414d7c243efabe4215b1865c616d25ce0 (patch) | |
tree | c6e577950cdebf7d4cf476062ab34407fafa0dc2 /src/quicktemplates2/qquickpopup.cpp | |
parent | 040c29bb91653a2adfa16a33781b3a2f7c29152d (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/qtquickcontrols2
$ find . -name "*.clazy.yaml"
$ clang-apply-replacements .
Task-number: QTBUG-20885
Task-number: QTBUG-84775
Change-Id: I7fb9b0603341ea1a0c3a00f79ebd642a6354702d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index bafa3110..1d6f125e 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -372,11 +372,11 @@ bool QQuickPopupPrivate::handleMouseEvent(QQuickItem *item, QMouseEvent *event) { switch (event->type()) { case QEvent::MouseButtonPress: - return handlePress(item, event->windowPos(), event->timestamp()); + return handlePress(item, event->scenePosition(), event->timestamp()); case QEvent::MouseMove: - return handleMove(item, event->windowPos(), event->timestamp()); + return handleMove(item, event->scenePosition(), event->timestamp()); case QEvent::MouseButtonRelease: - return handleRelease(item, event->windowPos(), event->timestamp()); + return handleRelease(item, event->scenePosition(), event->timestamp()); default: Q_UNREACHABLE(); return false; @@ -392,15 +392,15 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event) case QEvent::TouchEnd: for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { if (!acceptTouch(point)) - return blockInput(item, point.pos()); + return blockInput(item, point.position()); switch (point.state()) { case Qt::TouchPointPressed: - return handlePress(item, item->mapToScene(point.pos()), event->timestamp()); + return handlePress(item, item->mapToScene(point.position()), event->timestamp()); case Qt::TouchPointMoved: - return handleMove(item, item->mapToScene(point.pos()), event->timestamp()); + return handleMove(item, item->mapToScene(point.position()), event->timestamp()); case Qt::TouchPointReleased: - return handleRelease(item, item->mapToScene(point.pos()), event->timestamp()); + return handleRelease(item, item->mapToScene(point.position()), event->timestamp()); default: break; } |