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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp index 1781670cf3..a9a3534769 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp @@ -83,7 +83,7 @@ void InspectTool::leaveEvent(QEvent *) void InspectTool::mousePressEvent(QMouseEvent *event) { - m_mousePosition = event->localPos(); + m_mousePosition = event->position(); if (event->button() == Qt::LeftButton) { selectItem(); m_hoverHighlight->setVisible(false); @@ -92,7 +92,7 @@ void InspectTool::mousePressEvent(QMouseEvent *event) void InspectTool::mouseDoubleClickEvent(QMouseEvent *event) { - m_mousePosition = event->localPos(); + m_mousePosition = event->position(); if (event->button() == Qt::LeftButton) { selectNextItem(); m_hoverHighlight->setVisible(false); @@ -106,8 +106,8 @@ void InspectTool::mouseMoveEvent(QMouseEvent *event) void InspectTool::hoverMoveEvent(QMouseEvent *event) { - m_mousePosition = event->localPos(); - QQuickItem *item = inspector()->topVisibleItemAt(event->pos()); + m_mousePosition = event->position(); + QQuickItem *item = inspector()->topVisibleItemAt(event->position().toPoint()); if (!item || item == m_lastClickedItem) { m_hoverHighlight->setVisible(false); } else { @@ -123,7 +123,7 @@ void InspectTool::touchEvent(QTouchEvent *event) switch (event->type()) { case QEvent::TouchBegin: if (touchPoints.count() == 1 && (event->touchPointStates() & Qt::TouchPointPressed)) { - m_mousePosition = touchPoints.first().pos(); + m_mousePosition = touchPoints.first().position(); m_tapEvent = true; } else { m_tapEvent = false; @@ -133,7 +133,7 @@ void InspectTool::touchEvent(QTouchEvent *event) if (touchPoints.count() > 1) m_tapEvent = false; else if ((touchPoints.count() == 1) && (event->touchPointStates() & Qt::TouchPointMoved)) - m_mousePosition = touchPoints.first().pos(); + m_mousePosition = touchPoints.first().position(); break; } case QEvent::TouchEnd: { |