Locator: Cleanup and modernize Locator and filters

* Omit QLatin1{Char|String}
* Use member initialization
* Use range-based-for
  (and fixed the cases with non-const Qt container)
* Sort includes to common style

Change-Id: Ibc33a732bb153862efd6d5febfac758229cb61d4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>

1 files changed, 15 insertions, 13 deletions

diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
index f0777a92a0..cc04bd01e7 100644
--- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp
+++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
@@ -24,13 +24,14 @@
 ****************************************************************************/
 
 #include "locatorsettingspage.h"
-#include "locatorconstants.h"
 
-#include "locator.h"
-#include "ilocatorfilter.h"
 #include "directoryfilter.h"
+#include "ilocatorfilter.h"
+#include "locator.h"
+#include "locatorconstants.h"
 
 #include <coreplugin/coreconstants.h>
+#include <utils/asconst.h>
 #include <utils/categorysortfiltermodel.h>
 #include <utils/headerviewstretcher.h>
 #include <utils/qtcassert.h>
@@ -64,7 +65,7 @@ public:
     ILocatorFilter *filter() const;
 
 private:
-    ILocatorFilter *m_filter;
+    ILocatorFilter *m_filter = nullptr;
 };
 
 class CategoryItem : public TreeItem
@@ -76,7 +77,7 @@ public:
 
 private:
     QString m_name;
-    int m_order;
+    int m_order = 0;
 };
 
 } // Internal
@@ -269,32 +270,33 @@ void LocatorSettingsPage::setFilter(const QString &text)
 void LocatorSettingsPage::saveFilterStates()
 {
     m_filterStates.clear();
-    foreach (ILocatorFilter *filter, m_filters)
+    for (ILocatorFilter *filter : Utils::asConst(m_filters))
         m_filterStates.insert(filter, filter->saveState());
 }
 
 void LocatorSettingsPage::restoreFilterStates()
 {
-    foreach (ILocatorFilter *filter, m_filterStates.keys())
+    const QList<ILocatorFilter *> filterStatesKeys = m_filterStates.keys();
+    for (ILocatorFilter *filter : filterStatesKeys)
         filter->restoreState(m_filterStates.value(filter));
 }
 
 void LocatorSettingsPage::initializeModel()
 {
-    m_model->setHeader(QStringList({tr("Name"), tr("Prefix"), tr("Default")}));
-    m_model->setHeaderToolTip(QStringList({
+    m_model->setHeader({tr("Name"), tr("Prefix"), tr("Default")});
+    m_model->setHeaderToolTip({
         QString(),
         ILocatorFilter::msgPrefixToolTip(),
         ILocatorFilter::msgIncludeByDefaultToolTip()
-    }));
+    });
     m_model->clear();
     QSet<ILocatorFilter *> customFilterSet = m_customFilters.toSet();
     auto builtIn = new CategoryItem(tr("Built-in"), 0/*order*/);
-    foreach (ILocatorFilter *filter, m_filters)
+    for (ILocatorFilter *filter : Utils::asConst(m_filters))
         if (!filter->isHidden() && !customFilterSet.contains(filter))
             builtIn->appendChild(new FilterItem(filter));
     m_customFilterRoot = new CategoryItem(tr("Custom"), 1/*order*/);
-    foreach (ILocatorFilter *customFilter, m_customFilters)
+    for (ILocatorFilter *customFilter : Utils::asConst(m_customFilters))
         m_customFilterRoot->appendChild(new FilterItem(customFilter));
 
     m_model->rootItem()->appendChild(builtIn);
@@ -305,7 +307,7 @@ void LocatorSettingsPage::updateButtonStates()
 {
     const QModelIndex currentIndex = m_proxyModel->mapToSource(m_ui.filterList->currentIndex());
     bool selected = currentIndex.isValid();
-    ILocatorFilter *filter = 0;
+    ILocatorFilter *filter = nullptr;
     if (selected) {
         auto item = dynamic_cast<FilterItem *>(m_model->itemForIndex(currentIndex));
         if (item)