1 files changed, 128 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index be50e96..3c53f36 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.h
+++ b/src/gui/graphicsview/qgraphicssceneevent.h
@@ -42,8 +42,12 @@
 #ifndef QGRAPHICSSCENEEVENT_H
 #define QGRAPHICSSCENEEVENT_H
 
-#include <QtCore/qcoreevent.h>
+#include <QtGui/qevent.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qrect.h>
+#include <QtGui/qpolygon.h>
+#include <QtCore/qset.h>
+#include <QtCore/qhash.h>
 
 QT_BEGIN_HEADER
 
@@ -302,6 +306,129 @@ public:
     void setNewPos(const QPointF &pos);
 };
 
+class QGesture;
+class QGraphicsItem;
+class QGraphicsSceneGestureEventPrivate;
+class Q_GUI_EXPORT QGraphicsSceneGestureEvent : public QGraphicsSceneEvent
+{
+    Q_DECLARE_PRIVATE(QGraphicsSceneGestureEvent)
+public:
+    QGraphicsSceneGestureEvent();
+    ~QGraphicsSceneGestureEvent();
+
+    bool contains(const QString &type) const;
+    bool contains(Qt::GestureType type) const;
+
+    QList<QString> gestureTypes() const;
+
+    const QGesture* gesture(Qt::GestureType type) const;
+    const QGesture* gesture(const QString &type) const;
+    QList<QGesture*> gestures() const;
+    void setGestures(const QList<QGesture*> &gestures);
+    void setGestures(const QSet<QGesture*> &gestures);
+
+    QSet<QString> cancelledGestures() const;
+    void setCancelledGestures(const QSet<QString> &cancelledGestures);
+
+    void acceptAll();
+#ifndef Q_NO_USING_KEYWORD
+    using QEvent::accept;
+#else
+    inline void accept() { QEvent::accept(); }
+#endif
+    void accept(Qt::GestureType type);
+    void accept(const QString &type);
+
+    QPointF mapToScene(const QPoint &point) const;
+    QPolygonF mapToScene(const QRect &rect) const;
+    QPointF mapToItem(const QPoint &point, QGraphicsItem *item) const;
+    QPolygonF mapToItem(const QRect &rect, QGraphicsItem *item) const;
+
+protected:
+    QHash<QString, QGesture*> m_gestures;
+    QSet<QString> m_cancelledGestures;
+};
+
+class QGraphicsSceneTouchEventPrivate;
+class Q_GUI_EXPORT QGraphicsSceneTouchEvent : public QGraphicsSceneEvent
+{
+public:
+    class Q_GUI_EXPORT TouchPoint
+    {
+    public:
+        TouchPoint(int id = -1);
+        TouchPoint(const TouchPoint &other);
+        ~TouchPoint();
+
+        int id() const;
+        void setId(int id);
+
+        Qt::TouchPointState state() const;
+        void setState(Qt::TouchPointState state);
+
+        QPointF pos() const;
+        void setPos(const QPointF &pos);
+
+        QPointF startPos() const;
+        void setStartPos(const QPointF &startPos);
+
+        QPointF lastPos() const;
+        void setLastPos(const QPointF &lastPos);        
+
+        QPointF scenePos() const;
+        void setScenePos(const QPointF &scenePos);
+
+        QPointF startScenePos() const;
+        void setStartScenePos(const QPointF &startScenePos);
+
+        QPointF lastScenePos() const;
+        void setLastScenePos(const QPointF &lastScenePos);
+
+        QPointF screenPos() const;
+        void setScreenPos(const QPointF &screenPos);
+
+        QPointF startScreenPos() const;
+        void setStartScreenPos(const QPointF &startScreenPos);
+
+        QPointF lastScreenPos() const;
+        void setLastScreenPos(const QPointF &lastScreenPos);
+
+        QSizeF size() const;
+        void setSize(const QSizeF &size);
+
+        QSizeF sceneSize() const;
+        void setSceneSize(const QSizeF &sceneSize);
+
+        QSizeF screenSize() const;
+        void setScreenSize(const QSizeF &screenSize);
+
+        qreal pressure() const;
+        void setPressure(qreal pressure);
+
+        TouchPoint &operator=(const TouchPoint &other);
+
+    private:
+        TouchPoint(QTouchEventTouchPointPrivate *dd);
+        QTouchEventTouchPointPrivate *d;
+        friend class QGraphicsViewPrivate;
+    };
+
+    QGraphicsSceneTouchEvent(Type type = None);
+    ~QGraphicsSceneTouchEvent();
+
+    Qt::KeyboardModifiers modifiers() const;
+    void setModifiers(Qt::KeyboardModifiers modifiers);
+
+    Qt::TouchPointStates touchPointStates() const;
+    void setTouchPointStates(Qt::TouchPointStates touchPointStates);
+
+    const QList<QGraphicsSceneTouchEvent::TouchPoint> &touchPoints() const;
+    void setTouchPoints(const QList<QGraphicsSceneTouchEvent::TouchPoint> &touchPoints);
+
+private:
+    Q_DECLARE_PRIVATE(QGraphicsSceneTouchEvent);
+};
+
 #endif // QT_NO_GRAPHICSVIEW
 
 QT_END_NAMESPACE