qquickevents_p_p.h: move declaration of device below QQuickPointerEvent

In a following patch, the device will own the event instance by value,
so it needs to be defined first.

Change-Id: Id1520257115889198c3e9ff20c56028c0b6d4bd2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 87 insertions, 86 deletions

diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 38c333d2a4..b798165861 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -222,92 +222,6 @@ private:
     bool _accepted;
 };
 
-// ### Qt 6: move this to qtbase, replace QTouchDevice and the enums in QTabletEvent
-class Q_QUICK_PRIVATE_EXPORT QQuickPointerDevice : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(DeviceType type READ type CONSTANT)
-    Q_PROPERTY(PointerType pointerType READ pointerType CONSTANT)
-    Q_PROPERTY(Capabilities capabilities READ capabilities CONSTANT)
-    Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints CONSTANT)
-    Q_PROPERTY(int buttonCount READ buttonCount CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(qint64 uniqueId READ uniqueId CONSTANT)
-
-public:
-    enum DeviceType {
-        UnknownDevice = 0x0000,
-        Mouse = 0x0001,
-        TouchScreen = 0x0002,
-        TouchPad = 0x0004,
-        Puck = 0x0008,
-        Stylus = 0x0010,
-        Airbrush = 0x0020,
-        AllDevices = 0x003F
-    };
-    Q_DECLARE_FLAGS(DeviceTypes, DeviceType)
-    Q_ENUM(DeviceType)
-    Q_FLAG(DeviceTypes)
-
-    enum PointerType {
-        GenericPointer = 0x0001,
-        Finger = 0x0002,
-        Pen = 0x0004,
-        Eraser = 0x0008,
-        Cursor = 0x0010,
-        AllPointerTypes = 0x001F
-    };
-    Q_DECLARE_FLAGS(PointerTypes, PointerType)
-    Q_ENUM(PointerType)
-    Q_FLAG(PointerTypes)
-
-    enum CapabilityFlag {
-        Position    = QTouchDevice::Position,
-        Area        = QTouchDevice::Area,
-        Pressure    = QTouchDevice::Pressure,
-        Velocity    = QTouchDevice::Velocity,
-        // some bits reserved in case we need more of QTouchDevice::Capabilities
-        Scroll      = 0x0100, // mouse has a wheel, or there is OS-level scroll gesture recognition (dubious?)
-        Hover       = 0x0200,
-        Rotation    = 0x0400,
-        XTilt       = 0x0800,
-        YTilt       = 0x1000
-    };
-    Q_DECLARE_FLAGS(Capabilities, CapabilityFlag)
-    Q_ENUM(CapabilityFlag)
-    Q_FLAG(Capabilities)
-
-    QQuickPointerDevice(DeviceType devType, PointerType pType, Capabilities caps, int maxPoints, int buttonCount, const QString &name, qint64 uniqueId = 0)
-      : m_deviceType(devType), m_pointerType(pType), m_capabilities(caps)
-      , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name), m_uniqueId(uniqueId)
-    {}
-
-    ~QQuickPointerDevice() { }
-    DeviceType type() const { return m_deviceType; }
-    PointerType pointerType() const { return m_pointerType; }
-    Capabilities capabilities() const { return m_capabilities; }
-    bool hasCapability(CapabilityFlag cap) { return m_capabilities & cap; }
-    int maximumTouchPoints() const { return m_maximumTouchPoints; }
-    int buttonCount() const { return m_buttonCount; }
-    QString name() const { return m_name; }
-    qint64 uniqueId() const { return m_uniqueId; }
-
-private:
-    DeviceType m_deviceType;
-    PointerType m_pointerType;
-    Capabilities m_capabilities;
-    int m_maximumTouchPoints;
-    int m_buttonCount;
-    QString m_name;
-    qint64 m_uniqueId;
-
-    Q_DISABLE_COPY(QQuickPointerDevice)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::DeviceTypes)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::PointerTypes)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::Capabilities)
-
 class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject
 {
     Q_OBJECT
@@ -387,6 +301,7 @@ private:
 };
 
 class QQuickItem;
+class QQuickPointerDevice;
 
 class Q_QUICK_PRIVATE_EXPORT QQuickPointerEvent : public QObject
 {
@@ -451,6 +366,92 @@ private:
     Q_DISABLE_COPY(QQuickPointerEvent)
 };
 
+// ### Qt 6: move this to qtbase, replace QTouchDevice and the enums in QTabletEvent
+class Q_QUICK_PRIVATE_EXPORT QQuickPointerDevice : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(DeviceType type READ type CONSTANT)
+    Q_PROPERTY(PointerType pointerType READ pointerType CONSTANT)
+    Q_PROPERTY(Capabilities capabilities READ capabilities CONSTANT)
+    Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints CONSTANT)
+    Q_PROPERTY(int buttonCount READ buttonCount CONSTANT)
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(qint64 uniqueId READ uniqueId CONSTANT)
+
+public:
+    enum DeviceType {
+        UnknownDevice = 0x0000,
+        Mouse = 0x0001,
+        TouchScreen = 0x0002,
+        TouchPad = 0x0004,
+        Puck = 0x0008,
+        Stylus = 0x0010,
+        Airbrush = 0x0020,
+        AllDevices = 0x003F
+    };
+    Q_DECLARE_FLAGS(DeviceTypes, DeviceType)
+    Q_ENUM(DeviceType)
+    Q_FLAG(DeviceTypes)
+
+    enum PointerType {
+        GenericPointer = 0x0001,
+        Finger = 0x0002,
+        Pen = 0x0004,
+        Eraser = 0x0008,
+        Cursor = 0x0010,
+        AllPointerTypes = 0x001F
+    };
+    Q_DECLARE_FLAGS(PointerTypes, PointerType)
+    Q_ENUM(PointerType)
+    Q_FLAG(PointerTypes)
+
+    enum CapabilityFlag {
+        Position    = QTouchDevice::Position,
+        Area        = QTouchDevice::Area,
+        Pressure    = QTouchDevice::Pressure,
+        Velocity    = QTouchDevice::Velocity,
+        // some bits reserved in case we need more of QTouchDevice::Capabilities
+        Scroll      = 0x0100, // mouse has a wheel, or there is OS-level scroll gesture recognition (dubious?)
+        Hover       = 0x0200,
+        Rotation    = 0x0400,
+        XTilt       = 0x0800,
+        YTilt       = 0x1000
+    };
+    Q_DECLARE_FLAGS(Capabilities, CapabilityFlag)
+    Q_ENUM(CapabilityFlag)
+    Q_FLAG(Capabilities)
+
+    QQuickPointerDevice(DeviceType devType, PointerType pType, Capabilities caps, int maxPoints, int buttonCount, const QString &name, qint64 uniqueId = 0)
+      : m_deviceType(devType), m_pointerType(pType), m_capabilities(caps)
+      , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name), m_uniqueId(uniqueId)
+    {}
+
+    ~QQuickPointerDevice() { }
+    DeviceType type() const { return m_deviceType; }
+    PointerType pointerType() const { return m_pointerType; }
+    Capabilities capabilities() const { return m_capabilities; }
+    bool hasCapability(CapabilityFlag cap) { return m_capabilities & cap; }
+    int maximumTouchPoints() const { return m_maximumTouchPoints; }
+    int buttonCount() const { return m_buttonCount; }
+    QString name() const { return m_name; }
+    qint64 uniqueId() const { return m_uniqueId; }
+
+private:
+    DeviceType m_deviceType;
+    PointerType m_pointerType;
+    Capabilities m_capabilities;
+    int m_maximumTouchPoints;
+    int m_buttonCount;
+    QString m_name;
+    qint64 m_uniqueId;
+
+    Q_DISABLE_COPY(QQuickPointerDevice)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::DeviceTypes)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::PointerTypes)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPointerDevice::Capabilities)
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickKeyEvent)