From 56afef9e93180cd54021b0533b39fa5c4ad431a0 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 27 Oct 2017 15:38:15 +0200
Subject: [PATCH] Modernize InfoBar code

Use more algorithms, use range based loops where needed

Change-Id: I1fec57df18d93c86242e3ba7f8108f77c7e7112f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/coreplugin/infobar.cpp | 32 ++++++++++--------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp
index 5a3381d3e2c..5a2f99738fe 100644
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -25,6 +25,7 @@
 
 #include "infobar.h"
 
+#include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
 #include <utils/utilsicons.h>
@@ -92,23 +93,15 @@ void InfoBar::addInfo(const InfoBarEntry &info)
 
 void InfoBar::removeInfo(Id id)
 {
-    QMutableListIterator<InfoBarEntry> it(m_infoBarEntries);
-    while (it.hasNext())
-        if (it.next().id == id) {
-            it.remove();
-            emit changed();
-            return;
-        }
+    const int size = m_infoBarEntries.size();
+    Utils::erase(m_infoBarEntries, Utils::equal(&InfoBarEntry::id, id));
+    if (size != m_infoBarEntries.size())
+        emit changed();
 }
 
 bool InfoBar::containsInfo(Id id) const
 {
-    QListIterator<InfoBarEntry> it(m_infoBarEntries);
-    while (it.hasNext())
-        if (it.next().id == id)
-            return true;
-
-    return false;
+    return Utils::anyOf(m_infoBarEntries, Utils::equal(&InfoBarEntry::id, id));
 }
 
 // Remove and suppress id
@@ -155,9 +148,8 @@ void InfoBar::initialize(QSettings *settings, Theme *theme)
     m_theme = theme;
 
     if (QTC_GUARD(m_settings)) {
-        QStringList list = m_settings->value(QLatin1String(C_SUPPRESSED_WARNINGS)).toStringList();
-        foreach (const QString &id, list)
-            globallySuppressed.insert(Id::fromString(id));
+        const QStringList list = m_settings->value(QLatin1String(C_SUPPRESSED_WARNINGS)).toStringList();
+        globallySuppressed = Utils::transform<QSet>(list, Id::fromString);
     }
 }
 
@@ -177,9 +169,7 @@ void InfoBar::writeGloballySuppressedToSettings()
 {
     if (!m_settings)
         return;
-    QStringList list;
-    foreach (Id i, globallySuppressed)
-        list << QLatin1String(i.name());
+    const QStringList list = Utils::transform<QList>(globallySuppressed, &Id::toString);
     m_settings->setValue(QLatin1String(C_SUPPRESSED_WARNINGS), list);
 }
 
@@ -220,7 +210,7 @@ void InfoBarDisplay::infoBarDestroyed()
 
 void InfoBarDisplay::update()
 {
-    foreach (QWidget *widget, m_infoWidgets) {
+    for (QWidget *widget : m_infoWidgets) {
         widget->disconnect(this); // We want no destroyed() signal now
         delete widget;
     }
@@ -229,7 +219,7 @@ void InfoBarDisplay::update()
     if (!m_infoBar)
         return;
 
-    foreach (const InfoBarEntry &info, m_infoBar->m_infoBarEntries) {
+    for (const InfoBarEntry &info : m_infoBar->m_infoBarEntries) {
         QFrame *infoWidget = new QFrame;
 
         QPalette pal;