Modifications after the api review by Brad.

Gesture types are now separated to internal ones, which are listed as
enums (though they might be converted to strings internally), and
third party gestures which are referenced by strings.

From now on QGesture objects derive from QObject, which means third
party gesture recognizer developers can use QObjects property system
to store custom data inside QGesture without need to subclass it.

Some functions were renamed to show their purpose more clear.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 603f358..db3d03f 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -718,26 +718,27 @@ class Q_GUI_EXPORT QGestureEvent : public QEvent
 {
 public:
     QGestureEvent(const QList<QGesture*> &gestures,
-                  const QSet<Qt::GestureType> &cancelledGestures = QSet<Qt::GestureType>());
+                  const QSet<QString> &cancelledGestures = QSet<QString>());
     // internal ctor
     QGestureEvent(const QGestureEvent &gestures, const QPoint &offset);
     ~QGestureEvent();
 
-    inline bool contains(const Qt::GestureType &type) const
+    inline bool contains(const QString &type) const
     { return gesture(type) != 0; }
-    inline QList<Qt::GestureType> gestureTypes() const
+    inline QList<QString> gestureTypes() const
     { return m_gestures.keys(); }
-    inline const QGesture* gesture(const Qt::GestureType &type) const
+
+    inline const QGesture* gesture(const QString &type) const
     { return m_gestures.value(type, QSharedPointer<QGesture>()).data(); }
     inline QList<QSharedPointer<QGesture> > gestures() const
     { return m_gestures.values(); }
 
-    inline QSet<Qt::GestureType> cancelledGestures() const
+    inline QSet<QString> cancelledGestures() const
     { return m_cancelledGestures; }
 
 protected:
-    QHash<Qt::GestureType, QSharedPointer<QGesture> > m_gestures;
-    QSet<Qt::GestureType> m_cancelledGestures;
+    QHash<QString, QSharedPointer<QGesture> > m_gestures;
+    QSet<QString> m_cancelledGestures;
 
     friend class QApplication;
 };