From 2e0f7117b60781019fb97b3db73b731323b6609f Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 7 Jul 2020 08:19:12 +0200
Subject: Fix deprecations in manual tests

QEventPoint instead of TouchPoint:  we have source compatibility for that,
but we can use the new type to avoid the deprecation warnings.
Some position accessors have been renamed too.

Change-Id: I5bfe5bc853931127a883d2bd61fab122495fd427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 tests/manual/gestures/graphicsview/gestures.cpp                | 10 ++++------
 .../manual/gestures/graphicsview/mousepangesturerecognizer.cpp |  2 +-
 tests/manual/qtabletevent/regular_widgets/main.cpp             |  2 +-
 tests/manual/touch/main.cpp                                    |  6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'tests/manual')

diff --git a/tests/manual/gestures/graphicsview/gestures.cpp b/tests/manual/gestures/graphicsview/gestures.cpp
index 6e5b07bf18..26e6b1853b 100644
--- a/tests/manual/gestures/graphicsview/gestures.cpp
+++ b/tests/manual/gestures/graphicsview/gestures.cpp
@@ -54,17 +54,15 @@ QGestureRecognizer::Result ThreeFingerSlideGestureRecognizer::recognize(QGesture
     case QEvent::TouchUpdate:
         if (d->state() != Qt::NoGesture) {
             QTouchEvent *ev = static_cast<QTouchEvent*>(event);
-            if (ev->touchPoints().size() == 3) {
+            if (ev->points().size() == 3) {
                 d->gestureFired = true;
                 result = QGestureRecognizer::TriggerGesture;
             } else {
                 result = QGestureRecognizer::MayBeGesture;
-                for (int i = 0; i < ev->touchPoints().size(); ++i) {
-                    const QTouchEvent::TouchPoint &pt = ev->touchPoints().at(i);
-                    const int distance = (pt.pos().toPoint() - pt.startPos().toPoint()).manhattanLength();
-                    if (distance > 20) {
+                for (const QEventPoint &pt : ev->points()) {
+                    const int distance = (pt.globalPosition().toPoint() - pt.globalPressPosition().toPoint()).manhattanLength();
+                    if (distance > 20)
                         result = QGestureRecognizer::CancelGesture;
-                    }
                 }
             }
         } else {
diff --git a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
index 032fed933e..e70a9e4ef7 100644
--- a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
+++ b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
@@ -57,7 +57,7 @@ QGestureRecognizer::Result MousePanGestureRecognizer::recognize(QGesture *state,
     case QEvent::MouseButtonPress:
     case QEvent::MouseMove:
     case QEvent::MouseButtonRelease:
-        globalPos = static_cast<QMouseEvent *>(event)->globalPos();
+        globalPos = static_cast<QMouseEvent *>(event)->globalPosition().toPoint();
         break;
     default:
         break;
diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp
index 187d798339..8f14b2625f 100644
--- a/tests/manual/qtabletevent/regular_widgets/main.cpp
+++ b/tests/manual/qtabletevent/regular_widgets/main.cpp
@@ -272,7 +272,7 @@ bool EventReportWidget::event(QEvent *event)
     case QEvent::TouchUpdate:
         event->accept();
         m_touchPoints.clear();
-        for (const QTouchEvent::TouchPoint &p : static_cast<const QTouchEvent *>(event)->touchPoints())
+        for (const QEventPoint &p : static_cast<const QPointerEvent *>(event)->points())
             m_touchPoints.append(p.position());
         update();
         break;
diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp
index fdba80d7bb..bd8b39bb85 100644
--- a/tests/manual/touch/main.cpp
+++ b/tests/manual/touch/main.cpp
@@ -344,7 +344,7 @@ bool TouchTestWidget::event(QEvent *event)
     case QEvent::MouseButtonRelease:
         if (m_drawPoints) {
             const QMouseEvent *me = static_cast<const QMouseEvent *>(event);
-            m_points.append(Point(me->localPos(),
+            m_points.append(Point(me->position(),
                                   type == QEvent::MouseButtonPress ? MousePress : MouseRelease,
                                   me->source()));
             update();
@@ -353,8 +353,8 @@ bool TouchTestWidget::event(QEvent *event)
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
         if (m_drawPoints) {
-            for (const QTouchEvent::TouchPoint &p : static_cast<const QTouchEvent *>(event)->touchPoints())
-                m_points.append(Point(p.pos(), TouchPoint, Qt::MouseEventNotSynthesized, p.ellipseDiameters()));
+            for (const QEventPoint &p : static_cast<const QPointerEvent *>(event)->points())
+                m_points.append(Point(p.position(), TouchPoint, Qt::MouseEventNotSynthesized, p.ellipseDiameters()));
             update();
         }
         Q_FALLTHROUGH();
-- 
cgit v1.2.3