1 files changed, 118 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 449730d..0c4bbb7 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -52,6 +52,9 @@
 #include <QtGui/qmime.h>
 #include <QtGui/qdrag.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qset.h>
+#include <QtGui/qgesture.h>
 
 QT_BEGIN_HEADER
 
@@ -710,6 +713,41 @@ private:
 };
 #endif
 
+class Q_GUI_EXPORT QGestureEvent : public QEvent
+{
+public:
+    QGestureEvent(const QSet<QGesture*> &gestures,
+                  const QSet<QString> &cancelledGestures = QSet<QString>());
+    ~QGestureEvent();
+
+    bool contains(Qt::GestureType type) const;
+    bool contains(const QString &type) const;
+
+    QList<QString> gestureTypes() const;
+
+    const QGesture* gesture(Qt::GestureType type) const;
+    const QGesture* gesture(const QString &type) const;
+    QList<QGesture*> gestures() const;
+
+    QSet<QString> cancelledGestures() const;
+
+    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);
+
+protected:
+    QHash<QString, QGesture*> m_gestures;
+    QSet<QString> m_cancelledGestures;
+
+    friend class QApplication;
+    friend class QGestureManager;
+};
+
 #ifndef QT_NO_DEBUG_STREAM
 Q_GUI_EXPORT QDebug operator<<(QDebug, const QEvent *);
 #endif
@@ -719,6 +757,86 @@ 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 QTouchEventTouchPointPrivate;
+class Q_GUI_EXPORT QTouchEvent : public QInputEvent
+{
+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 globalPos() const;
+        void setGlobalPos(const QPointF &globalPos);
+
+        QPointF startGlobalPos() const;
+        void setStartGlobalPos(const QPointF &startGlobalPos);
+
+        QPointF lastGlobalPos() const;
+        void setLastGlobalPos(const QPointF &lastGlobalPos);
+
+        QSizeF size() const;
+        void setSize(const QSizeF &size);
+
+        qreal pressure() const;
+        void setPressure(qreal pressure);
+
+        TouchPoint &operator=(const TouchPoint &other);
+
+    private:
+        QTouchEventTouchPointPrivate *d;
+
+        friend class QTouchEventTouchPointPrivate;
+    };
+
+    QTouchEvent(QEvent::Type type,
+                Qt::KeyboardModifiers modifiers,
+                Qt::TouchPointStates touchPointStates,
+                const QList<QTouchEvent::TouchPoint> &touchPoints);
+    ~QTouchEvent();
+
+    inline Qt::TouchPointStates touchPointStates() const
+    {
+        return _touchPointStates;
+    }
+    inline void setTouchPointStates(Qt::TouchPointStates touchPointStates)
+    {
+        _touchPointStates = touchPointStates;
+    }
+
+    inline const QList<QTouchEvent::TouchPoint> &touchPoints() const
+    {
+        return _touchPoints;
+    }
+    inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
+    {
+        _touchPoints = touchPoints;
+    }
+
+protected:
+    Qt::TouchPointStates _touchPointStates;
+    QList<QTouchEvent::TouchPoint> _touchPoints;
+
+    friend class QApplicationPrivate;
+};
+
 QT_END_NAMESPACE
 
 QT_END_HEADER