1 files changed, 12 insertions, 13 deletions

diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index d0c6b882b5..541519245e 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -105,11 +105,10 @@ QGestureManager::QGestureManager(QObject *parent)
 QGestureManager::~QGestureManager()
 {
     qDeleteAll(m_recognizers);
-    foreach (QGestureRecognizer *recognizer, m_obsoleteGestures.keys()) {
-        qDeleteAll(m_obsoleteGestures.value(recognizer));
-        delete recognizer;
+    for (auto it = m_obsoleteGestures.cbegin(), end = m_obsoleteGestures.cend(); it != end; ++it) {
+        qDeleteAll(it.value());
+        delete it.key();
     }
-    m_obsoleteGestures.clear();
 }
 
 Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *recognizer)
@@ -188,7 +187,7 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
     // from the destructor.
     if (object->isWidgetType()) {
         if (static_cast<QWidget *>(object)->d_func()->data.in_destructor)
-            return 0;
+            return nullptr;
     } else if (QGesture *g = qobject_cast<QGesture *>(object)) {
         return g;
 #if QT_CONFIG(graphicsview)
@@ -196,7 +195,7 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
         Q_ASSERT(qobject_cast<QGraphicsObject *>(object));
         QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(object);
         if (graphicsObject->QGraphicsItem::d_func()->inDestructor)
-            return 0;
+            return nullptr;
 #endif
     }
 
@@ -210,7 +209,7 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
     Q_ASSERT(recognizer);
     QGesture *state = recognizer->create(object);
     if (!state)
-        return 0;
+        return nullptr;
     state->setParent(this);
     if (state->gestureType() == Qt::CustomGesture) {
         // if the recognizer didn't fill in the gesture type, then this
@@ -454,13 +453,13 @@ void QGestureManager::cancelGesturesForChildren(QGesture *original)
     // sort them per target widget by cherry picking from almostCanceledGestures and delivering
     QSet<QGesture *> almostCanceledGestures = cancelledGestures;
     while (!almostCanceledGestures.isEmpty()) {
-        QWidget *target = 0;
+        QWidget *target = nullptr;
         QSet<QGesture*> gestures;
         iter = almostCanceledGestures.begin();
         // sort per target widget
         while (iter != almostCanceledGestures.end()) {
             QWidget *widget = m_gestureTargets.value(*iter);
-            if (target == 0)
+            if (target == nullptr)
                 target = widget;
             if (target == widget) {
                 gestures << *iter;
@@ -508,7 +507,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
         }
     }
     // find all gesture contexts for the widget tree
-    w = w->isWindow() ? 0 : w->parentWidget();
+    w = w->isWindow() ? nullptr : w->parentWidget();
     while (w)
     {
         for (ContextIterator it = w->d_func()->gestureContext.constBegin(),
@@ -587,7 +586,7 @@ void QGestureManager::getGestureTargets(const QSet<QGesture*> &gestures,
 
     // sort gestures by types
     foreach (QGesture *gesture, gestures) {
-        QWidget *receiver = m_gestureTargets.value(gesture, 0);
+        QWidget *receiver = m_gestureTargets.value(gesture, nullptr);
         Q_ASSERT(receiver);
         if (receiver)
             gestureByTypes[gesture->gestureType()].insert(receiver, gesture);
@@ -611,7 +610,7 @@ void QGestureManager::getGestureTargets(const QSet<QGesture*> &gestures,
                     }
                 }
                 if (w->isWindow()) {
-                    w = 0;
+                    w = nullptr;
                     break;
                 }
                 w = w->parentWidget();
@@ -637,7 +636,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
     for (QSet<QGesture *>::const_iterator it = gestures.begin(),
          e = gestures.end(); it != e; ++it) {
         QGesture *gesture = *it;
-        QWidget *target = m_gestureTargets.value(gesture, 0);
+        QWidget *target = m_gestureTargets.value(gesture, nullptr);
         if (!target) {
             // the gesture has just started and doesn't have a target yet.
             Q_ASSERT(gesture->state() == Qt::GestureStarted);