Implement QApplication::unregisterGestureRecognizer

Reviewed-by: Denis Dzyubenko

1 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index f0e7225..eef45d2 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -104,7 +104,7 @@ private:
         Qt::GestureType gesture;
 
         ObjectGesture(QObject *o, const Qt::GestureType &g) : object(o), gesture(g) { }
-        inline bool operator<(const ObjectGesture& rhs) const
+        inline bool operator<(const ObjectGesture &rhs) const
         {
             if (object.data() < rhs.object.data())
                 return true;
@@ -114,7 +114,8 @@ private:
         }
     };
 
-    QMap<ObjectGesture, QGesture *> objectGestures;
+    // TODO rename all member vars to be m_
+    QMap<ObjectGesture, QGesture *> objectGestures; // TODO rename widgetGestures
     QMap<QGesture *, QGestureRecognizer *> gestureToRecognizer;
     QHash<QGesture *, QObject *> gestureOwners;
 
@@ -122,6 +123,10 @@ private:
 
     int lastCustomGestureId;
 
+    QHash<QGestureRecognizer *, QList<QGesture *> > m_obsoleteGestures;
+    QMap<QGesture *, QGestureRecognizer *> m_deletedRecognizers;
+    void cleanupGesturesForRemovedRecognizer(QGesture *gesture);
+
     QGesture *getState(QObject *widget, Qt::GestureType gesture);
     void deliverEvents(const QSet<QGesture *> &gestures,
                        QSet<QGesture *> *undeliveredGestures);