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>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 52ae1bab94..b491445323 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -288,10 +288,10 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject
 
 public:
     enum State {
-        Pressed     = Qt::TouchPointPressed,
-        Updated     = Qt::TouchPointMoved,
-        Stationary  = Qt::TouchPointStationary,
-        Released    = Qt::TouchPointReleased
+        Pressed     = QEventPoint::State::Pressed,
+        Updated     = QEventPoint::State::Updated,
+        Stationary  = QEventPoint::State::Stationary,
+        Released    = QEventPoint::State::Released
     };
     Q_DECLARE_FLAGS(States, State)
     Q_FLAG(States)
@@ -309,7 +309,7 @@ public:
 
     QQuickEventPoint(QQuickPointerEvent *parent);
 
-    void reset(Qt::TouchPointState state, const QPointF &scenePosition, int pointId, ulong timestamp, const QVector2D &velocity = QVector2D());
+    void reset(QEventPoint::State state, const QPointF &scenePosition, int pointId, ulong timestamp, const QVector2D &velocity = QVector2D());
     void localizePosition(QQuickItem *target);
 
     QQuickPointerEvent *pointerEvent() const;
@@ -384,7 +384,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventTouchPoint : public QQuickEventPoint
 public:
     QQuickEventTouchPoint(QQuickPointerTouchEvent *parent);
 
-    void reset(const QTouchEvent::TouchPoint &tp, ulong timestamp);
+    void reset(const QEventPoint &tp, ulong timestamp);
 
     qreal rotation() const { return m_rotation; }
     qreal pressure() const { return m_pressure; }
@@ -551,7 +551,7 @@ public:
     int pointCount() const override { return m_pointCount; }
     QQuickEventPoint *point(int i) const override;
     QQuickEventPoint *pointById(int pointId) const override;
-    const QTouchEvent::TouchPoint *touchPointById(int pointId) const;
+    const QEventPoint *touchPointById(int pointId) const;
     bool allPointsAccepted() const override;
     bool allUpdatedPointsAccepted() const override;
     bool allPointsGrabbed() const override;
@@ -565,7 +565,7 @@ public:
     QTouchEvent *asTouchEvent() const;
 
 private:
-    Qt::TouchPointStates touchPointStates() const;
+    QEventPoint::States touchPointStates() const;
 
     int m_pointCount = 0;
     QVector<QQuickEventTouchPoint *> m_touchPoints;