summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager_p.h
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-05-07 14:52:00 +0200
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-05-18 14:44:06 +0200
commitdd59023394a8f4cdaf4be9f632d58434f52c76e4 (patch)
tree9b9ff6cbcb96014c962725ee4eff722b8c6e114a /src/gui/kernel/qgesturemanager_p.h
parent4ec480ef000d60c2a177db29686b4aeb2511532f (diff)
Removed the "maybe" timer from gesturemanager.
According to users of the api "maybe" timer (that is supposed to cancel gestures that have stayed in the "MaybeGesture" state for too long) is not useful and might even harm some gestures, so removing it completely and leaving it up to the author of a gesture recognizer to make sure the state machine is implemented properly. Task-number: QTBUG-9926 Reviewed-by: Thomas Zander
Diffstat (limited to 'src/gui/kernel/qgesturemanager_p.h')
-rw-r--r--src/gui/kernel/qgesturemanager_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index c105c9b6d0..c452f4999e 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -85,7 +85,6 @@ public:
void recycle(QGesture *gesture);
protected:
- void timerEvent(QTimerEvent *event);
bool filterEventThroughContexts(const QMultiMap<QObject *, Qt::GestureType> &contexts,
QEvent *event);
@@ -93,7 +92,7 @@ private:
QMultiMap<Qt::GestureType, QGestureRecognizer *> m_recognizers;
QSet<QGesture *> m_activeGestures;
- QHash<QGesture *, QBasicTimer> m_maybeGestures;
+ QSet<QGesture *> m_maybeGestures;
enum State {
Gesture,