Replaced evil foreach with a for loop.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index c7341f2..1dda34c 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -248,11 +248,15 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
         activeGestures -= newMaybeGestures;
         activeGestures -= cancelledGestures;
         activeGestures += startedGestures;
-        foreach(QGestureRecognizer *r, startedGestures+finishedGestures+notGestures) {
-            QMap<QGestureRecognizer*, int>::iterator it = maybeGestures.find(r);
-            if (it != maybeGestures.end()) {
+        for(QMap<QGestureRecognizer*, int>::iterator it = maybeGestures.begin();
+            it != maybeGestures.end();) {
+            QGestureRecognizer *r = it.key();
+            if (startedGestures.contains(r) || finishedGestures.contains(r) ||
+                notGestures.contains(r)) {
                 killTimer(it.value());
-                maybeGestures.erase(it);
+                it = maybeGestures.erase(it);
+            } else {
+                ++it;
             }
         }
         foreach(QGestureRecognizer *r, newMaybeGestures) {