rename QPointerUniqueId -> QPointingDeviceUniqueId

Several people agreed that the name was confusing and that this one
is better.

Task-number: QTBUG-54616
Change-Id: I31cf057f4bc818332b0551a27d1711599440207c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Sune Vuorela <sune@vuorela.dk>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index b7c0f3338e..7d5b719e09 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -793,7 +793,7 @@ inline bool operator==(QKeyEvent *e, QKeySequence::StandardKey key){return (e ?
 inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ? e->matches(key) : false);}
 #endif // QT_NO_SHORTCUT
 
-class Q_GUI_EXPORT QPointerUniqueId
+class Q_GUI_EXPORT QPointingDeviceUniqueId
 {
     Q_GADGET
     // ### kept these to keep other modules compiling. Remove before 5.8.0 final!
@@ -803,11 +803,11 @@ class Q_GUI_EXPORT QPointerUniqueId
     Q_PROPERTY(qint64 numericId READ numericId CONSTANT)
 public:
     Q_ALWAYS_INLINE
-    Q_DECL_CONSTEXPR QPointerUniqueId() Q_DECL_NOTHROW : m_numericId(-1) {}
+    Q_DECL_CONSTEXPR QPointingDeviceUniqueId() Q_DECL_NOTHROW : m_numericId(-1) {}
     // compiler-generated copy/move ctor/assignment operators are ok!
     // compiler-generated dtor is ok!
 
-    static QPointerUniqueId fromNumericId(qint64 id);
+    static QPointingDeviceUniqueId fromNumericId(qint64 id);
 
     Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return m_numericId != -1; }
     qint64 numericId() const Q_DECL_NOTHROW;
@@ -815,7 +815,7 @@ public:
     // ### kept these to keep other modules compiling. Remove before 5.8.0 final!
 #if QT_DEPRECATED_SINCE(5, 8)
     Q_ALWAYS_INLINE Q_DECL_DEPRECATED qint64 numeric() const { return numericId(); }
-    Q_ALWAYS_INLINE Q_DECL_DEPRECATED explicit QPointerUniqueId(qint64 id) : m_numericId(id) {}
+    Q_ALWAYS_INLINE Q_DECL_DEPRECATED explicit QPointingDeviceUniqueId(qint64 id) : m_numericId(id) {}
 #endif
 private:
     // TODO: for TUIO 2, or any other type of complex token ID, an internal
@@ -823,13 +823,13 @@ private:
     // In this case, m_numericId will then turn into an index into that array (or hash).
     qint64 m_numericId;
 };
-Q_DECLARE_TYPEINFO(QPointerUniqueId, Q_MOVABLE_TYPE);
-template <> class QList<QPointerUniqueId> {}; // to prevent instantiation: use QVector instead
+Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE);
+template <> class QList<QPointingDeviceUniqueId> {}; // to prevent instantiation: use QVector instead
 
-Q_GUI_EXPORT bool operator==(QPointerUniqueId lhs, QPointerUniqueId rhs) Q_DECL_NOTHROW;
-inline bool operator!=(QPointerUniqueId lhs, QPointerUniqueId rhs) Q_DECL_NOTHROW
+Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL_NOTHROW;
+inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL_NOTHROW
 { return !operator==(lhs, rhs); }
-Q_GUI_EXPORT uint qHash(QPointerUniqueId key, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(QPointingDeviceUniqueId key, uint seed = 0) Q_DECL_NOTHROW;
 
 
 
@@ -868,7 +868,7 @@ public:
         { qSwap(d, other.d); }
 
         int id() const;
-        QPointerUniqueId uniqueId() const;
+        QPointingDeviceUniqueId uniqueId() const;
 
         Qt::TouchPointState state() const;