Refactor the touch event dispatching code in preparation for allowing external event generators

This introduces QEvent::RawTouch event type, which should be used by the low-level
translator. This raw QTouchEvent can be sent to either QApplication or to a window,
and Qt will do the rest to dispatch the touch points to the correct place.

2 files changed, 12 insertions, 9 deletions

diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 77679dc..d28d34e 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -222,6 +222,7 @@ QT_BEGIN_NAMESPACE
     \value ZOrderChange                     The widget's z-order has changed. This event is never sent to top level windows.
     \value KeyboardLayoutChange             The keyboard layout has changed.
     \value DynamicPropertyChange            A dynamic property was added, changed or removed from the object.
+    \value RawTouch                         A raw event from a touch-screen or track-pad device (QTouchEvent)
     \value TouchBegin                       Beginning of a sequence of touch-screen and/or track-pad events (QTouchEvent)
     \value TouchUpdate                      Touch-screen event (QTouchEvent)
     \value TouchEnd                         End of touch-event sequence (QTouchEvent)
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index feefd08..3381a31 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -272,15 +272,17 @@ public:
         Signal = 192,
         Wrapped = 193,
 
-        TouchBegin = 194,
-        TouchUpdate = 195,
-        TouchEnd = 196,
-        GraphicsSceneTouchBegin = 197,
-        GraphicsSceneTouchUpdate = 198,
-        GraphicsSceneTouchEnd = 199,
-
-        Gesture = 200,
-        GraphicsSceneGesture = 201,
+        RawTouch = 194,
+
+        TouchBegin = 195,
+        TouchUpdate = 196,
+        TouchEnd = 197,
+        GraphicsSceneTouchBegin = 198,
+        GraphicsSceneTouchUpdate = 199,
+        GraphicsSceneTouchEnd = 200,
+
+        Gesture = 201,
+        GraphicsSceneGesture = 202,
 
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event