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, 5 insertions, 4 deletions

diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index e36b966..a76c50a 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -613,10 +613,10 @@ public:
     void setWindowSurface(QWindowSurface *surface);
     QWindowSurface *windowSurface() const;
 
-    void grabGesture(const Qt::GestureType &gesture);
-    void grabGestures(const QSet<Qt::GestureType> &gestures);
-    void releaseGesture(const Qt::GestureType &gesture);
-    QSet<Qt::GestureType> gestures() const;
+    int grabGesture(const QString &gesture);
+    int grabGesture(Qt::GestureType gesture);
+    void releaseGesture(int gestureId);
+    void setGestureEnabled(int gestureId, bool enable);
 
 Q_SIGNALS:
     void customContextMenuRequested(const QPoint &pos);
@@ -755,6 +755,7 @@ private:
     friend bool isWidgetOpaque(const QWidget *);
     friend class QGLWidgetPrivate;
 #endif
+    friend class QGestureManager;
 #ifdef Q_WS_X11
     friend void qt_net_update_user_time(QWidget *tlw, unsigned long timestamp);
     friend void qt_net_remove_user_time(QWidget *tlw);