Fix Krazy warnings about values or keys iteration in various places.

Change-Id: Iced108cc7fc74f6ce5501c59db7090fea21cb87a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 02552e2602..b65f21f31c 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -312,10 +312,12 @@ void LocatorWidget::setPlaceholderText(const QString &text)
 
 void LocatorWidget::updateFilterList()
 {
+    typedef QMap<Id, QAction *> IdActionMap;
+
     m_filterMenu->clear();
 
     // update actions and menu
-    QMap<Id, QAction *> actionCopy = m_filterActionMap;
+    IdActionMap actionCopy = m_filterActionMap;
     m_filterActionMap.clear();
     // register new actions, update existent
     foreach (ILocatorFilter *filter, m_locatorPlugin->filters()) {
@@ -343,9 +345,11 @@ void LocatorWidget::updateFilterList()
     }
 
     // unregister actions that are deleted now
-    foreach (const Id id, actionCopy.keys())
-        ActionManager::unregisterAction(actionCopy.value(id), id.withPrefix("Locator."));
-    qDeleteAll(actionCopy);
+    const IdActionMap::Iterator end = actionCopy.end();
+    for (IdActionMap::Iterator it = actionCopy.begin(); it != end; ++it) {
+        ActionManager::unregisterAction(it.value(), it.key().withPrefix("Locator."));
+        delete it.value();
+    }
 
     m_filterMenu->addSeparator();
     m_filterMenu->addAction(m_refreshAction);