remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)

the API for these 2 classes is identical, the implementation is almost
identical, they share the same data structures, so bite the bullet and
merge them.

this means we go back to using screenPos() instead of globalPos()
again

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index bd312a1..6983d12 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -35,7 +35,7 @@
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
+** $QT_END_LICENSE$'
 **
 ****************************************************************************/
 
@@ -304,12 +304,12 @@ public:
     void releaseGesture(QGraphicsItem *item, int gestureId);
     void sendGestureEvent(const QSet<QGesture*> &gestures, const QSet<QString> &cancelled);
 
-    QMap<int, QGraphicsSceneTouchEvent::TouchPoint> sceneCurrentTouchPoints;
+    QMap<int, QTouchEvent::TouchPoint> sceneCurrentTouchPoints;
     QHash<int, QGraphicsItem *> itemForTouchPointId;
-    static void updateTouchPointsForItem(QGraphicsItem *item, QGraphicsSceneTouchEvent *touchEvent);
+    static void updateTouchPointsForItem(QGraphicsItem *item, QTouchEvent *touchEvent);
     int findClosestTouchPointId(const QPointF &scenePos);
-    void touchEventHandler(QGraphicsSceneTouchEvent *touchEvent);
-    bool sendTouchBeginEvent(QGraphicsItem *item, QGraphicsSceneTouchEvent *touchEvent);
+    void touchEventHandler(QTouchEvent *touchEvent);
+    bool sendTouchBeginEvent(QGraphicsItem *item, QTouchEvent *touchEvent);
 };
 
 QT_END_NAMESPACE