Change QQuickEventPoint::pointId to be plain int

After change 8984c42d1779b13fd29d95274af2d01d32528e52 in qtbase, a
QTouchEvent::TouchPoint::id is already guaranteed to be unique across
devices. We therefore don't need a larger value space for
QQuickEventPoint::pointId, since that value is the same value as we got
from the QTouchEvent

Change-Id: I044630a812706f3c114bb28cffb29536f9feeeb3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

4 files changed, 15 insertions, 15 deletions

diff --git a/src/quick/handlers/qquickmultipointerhandler.cpp b/src/quick/handlers/qquickmultipointerhandler.cpp
index 4b931641a2..373f10dc16 100644
--- a/src/quick/handlers/qquickmultipointerhandler.cpp
+++ b/src/quick/handlers/qquickmultipointerhandler.cpp
@@ -119,7 +119,7 @@ bool QQuickMultiPointerHandler::sameAsCurrentPoints(QQuickPointerEvent *event)
     // or use std::equal with a predicate
     for (int i = 0; ret && i < c; ++i) {
         bool found = false;
-        quint64 pointId = event->point(i)->pointId();
+        int pointId = event->point(i)->pointId();
         for (QQuickEventPoint *o : qAsConst(m_currentPoints))
             if (o && pointId == o->pointId())
                 found = true;
diff --git a/src/quick/handlers/qquickpointersinglehandler_p.h b/src/quick/handlers/qquickpointersinglehandler_p.h
index a82ec72ad6..ad2d663054 100644
--- a/src/quick/handlers/qquickpointersinglehandler_p.h
+++ b/src/quick/handlers/qquickpointersinglehandler_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class Q_QUICK_PRIVATE_EXPORT QQuickPointerSingleHandler : public QQuickPointerDeviceHandler
 {
     Q_OBJECT
-    Q_PROPERTY(quint64 pointId READ pointId NOTIFY pointIdChanged)
+    Q_PROPERTY(int pointId READ pointId NOTIFY pointIdChanged)
     Q_PROPERTY(QPointingDeviceUniqueId uniquePointId READ uniquePointId NOTIFY pointIdChanged)
     Q_PROPERTY(QPointF pos READ pos NOTIFY eventPointHandled)
     Q_PROPERTY(QPointF scenePos READ scenePos NOTIFY eventPointHandled)
@@ -98,7 +98,7 @@ protected:
     virtual bool wantsEventPoint(QQuickEventPoint *point);
     void handlePointerEventImpl(QQuickPointerEvent *event) override;
     virtual void handleEventPoint(QQuickEventPoint *point) = 0;
-    quint64 pointId() const { return m_pointId; }
+    int pointId() const { return m_pointId; }
     QQuickEventPoint *currentPoint(QQuickPointerEvent *ev) { return ev->pointById(m_pointId); }
     void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabState stateChange, QQuickEventPoint *point) override;
 
@@ -107,7 +107,7 @@ private:
     void reset();
 
 private:
-    quint64 m_pointId;
+    int m_pointId;
     QPointingDeviceUniqueId m_uniquePointId;
     Qt::MouseButtons m_pressedButtons;
     QPointF m_pos;
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index c78df999e8..a7ab0f01b0 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -531,7 +531,7 @@ QQuickPointerDevice *QQuickPointerDevice::tabletDevice(qint64 id)
     return nullptr;
 }
 
-void QQuickEventPoint::reset(Qt::TouchPointState state, const QPointF &scenePos, quint64 pointId, ulong timestamp, const QVector2D &velocity)
+void QQuickEventPoint::reset(Qt::TouchPointState state, const QPointF &scenePos, int pointId, ulong timestamp, const QVector2D &velocity)
 {
     m_scenePos = scenePos;
     if (m_pointId != pointId) {
@@ -1146,15 +1146,15 @@ QMouseEvent *QQuickPointerTouchEvent::syntheticMouseEvent(int pointID, QQuickIte
     \l {QQuickEventPoint::pointId}{pointId}.
     Returns nullptr if there is no point with that ID.
 
-    \fn QQuickPointerEvent::pointById(quint64 pointId) const
+    \fn QQuickPointerEvent::pointById(int pointId) const
 */
-QQuickEventPoint *QQuickPointerMouseEvent::pointById(quint64 pointId) const {
+QQuickEventPoint *QQuickPointerMouseEvent::pointById(int pointId) const {
     if (m_mousePoint && pointId == m_mousePoint->pointId())
         return m_mousePoint;
     return nullptr;
 }
 
-QQuickEventPoint *QQuickPointerTouchEvent::pointById(quint64 pointId) const {
+QQuickEventPoint *QQuickPointerTouchEvent::pointById(int pointId) const {
     auto it = std::find_if(m_touchPoints.constBegin(), m_touchPoints.constEnd(),
         [pointId](const QQuickEventTouchPoint *tp) { return tp->pointId() == pointId; } );
     if (it != m_touchPoints.constEnd())
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 51e31bd7d7..455648a743 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -259,7 +259,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject
     Q_PROPERTY(QPointF sceneGrabPos READ sceneGrabPos)
     Q_PROPERTY(QVector2D velocity READ velocity)
     Q_PROPERTY(State state READ state)
-    Q_PROPERTY(quint64 pointId READ pointId)
+    Q_PROPERTY(int pointId READ pointId)
     Q_PROPERTY(qreal timeHeld READ timeHeld)
     Q_PROPERTY(QVector2D velocity READ velocity)
     Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
@@ -288,7 +288,7 @@ public:
 
     QQuickEventPoint(QQuickPointerEvent *parent);
 
-    void reset(Qt::TouchPointState state, const QPointF &scenePos, quint64 pointId, ulong timestamp, const QVector2D &velocity = QVector2D());
+    void reset(Qt::TouchPointState state, const QPointF &scenePos, int pointId, ulong timestamp, const QVector2D &velocity = QVector2D());
     void localizePosition(QQuickItem *target);
 
     QQuickPointerEvent *pointerEvent() const;
@@ -298,7 +298,7 @@ public:
     QPointF sceneGrabPos() const { return m_sceneGrabPos; }
     QVector2D velocity() const { return m_velocity; }
     State state() const { return m_state; }
-    quint64 pointId() const { return m_pointId; }
+    int pointId() const { return m_pointId; }
     qreal timeHeld() const { return (m_timestamp - m_pressTimestamp) / 1000.0; }
     bool isAccepted() const { return m_accept; }
     void setAccepted(bool accepted = true);
@@ -329,7 +329,7 @@ private:
     QPointF m_scenePressPos;
     QPointF m_sceneGrabPos;
     QVector2D m_velocity;
-    quint64 m_pointId;
+    int m_pointId;
     QPointer<QObject> m_exclusiveGrabber;
     QVector<QPointer <QQuickPointerHandler> > m_passiveGrabbers;
     ulong m_timestamp;
@@ -415,7 +415,7 @@ public: // helpers for C++ only (during event delivery)
 
     virtual int pointCount() const = 0;
     virtual QQuickEventPoint *point(int i) const = 0;
-    virtual QQuickEventPoint *pointById(quint64 pointId) const = 0;
+    virtual QQuickEventPoint *pointById(int pointId) const = 0;
     virtual QVector<QObject *> exclusiveGrabbers() const = 0;
     virtual void clearGrabbers() const = 0;
     virtual bool hasExclusiveGrabber(const QQuickPointerHandler *handler) const = 0;
@@ -445,7 +445,7 @@ public:
     const QQuickPointerMouseEvent *asPointerMouseEvent() const override { return this; }
     int pointCount() const override { return 1; }
     QQuickEventPoint *point(int i) const override;
-    QQuickEventPoint *pointById(quint64 pointId) const override;
+    QQuickEventPoint *pointById(int pointId) const override;
     bool allPointsAccepted() const override;
     bool allUpdatedPointsAccepted() const override;
     bool allPointsGrabbed() const override;
@@ -478,7 +478,7 @@ public:
     const QQuickPointerTouchEvent *asPointerTouchEvent() const override { return this; }
     int pointCount() const override { return m_pointCount; }
     QQuickEventPoint *point(int i) const override;
-    QQuickEventPoint *pointById(quint64 pointId) const override;
+    QQuickEventPoint *pointById(int pointId) const override;
     const QTouchEvent::TouchPoint *touchPointById(int pointId) const;
     bool allPointsAccepted() const override;
     bool allUpdatedPointsAccepted() const override;