From c0e72e34863a5628c51e5c3bb42bcc455c310340 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Mon, 13 Jul 2020 13:40:04 +0200
Subject: Replace QTouchEvent::TouchPoint with QEventPoint

It's a cosmetic change at this time, because we have declared
using TouchPoint = QEventPoint;

Also replace Qt::TouchPointState enum with QEventPoint::State.

Task-number: QTBUG-72173
Change-Id: Ife017aa98801c28abc6cccd106f47a95421549de
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 tests/auto/quick/touchmouse/tst_touchmouse.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/auto/quick/touchmouse')

diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 88348b8889..bd838d8d61 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -56,14 +56,14 @@ struct Event
         :type(t), mousePos(mouse), mousePosGlobal(global)
     {}
 
-    Event(QEvent::Type t, QList<QTouchEvent::TouchPoint> touch)
+    Event(QEvent::Type t, QList<QEventPoint> touch)
         :type(t), points(touch)
     {}
 
     QEvent::Type type;
     QPoint mousePos;
     QPoint mousePosGlobal;
-    QList<QTouchEvent::TouchPoint> points;
+    QList<QEventPoint> points;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -101,7 +101,7 @@ public:
     void touchEvent(QTouchEvent *event)
     {
         eventList.append(Event(event->type(), event->touchPoints()));
-        QList<QTouchEvent::TouchPoint> tps = event->touchPoints();
+        QList<QEventPoint> tps = event->touchPoints();
         Q_ASSERT(!tps.isEmpty());
         point0 = tps.first().id();
         event->setAccepted(acceptTouch);
@@ -156,7 +156,7 @@ public:
                 event->type() == QEvent::TouchEnd) {
             QTouchEvent *touch = static_cast<QTouchEvent*>(event);
             eventList.append(Event(event->type(), touch->touchPoints()));
-            QList<QTouchEvent::TouchPoint> tps = touch->touchPoints();
+            QList<QEventPoint> tps = touch->touchPoints();
             Q_ASSERT(!tps.isEmpty());
             point0 = tps.first().id();
             if (filterTouch)
-- 
cgit v1.2.3