From 5efc0e8d9d3e63999fe2b2c8de91c02142cc85f8 Mon Sep 17 00:00:00 2001
From: Juraj Oravec <sgd.orava@gmail.com>
Date: Mon, 30 Dec 2019 20:15:32 +0100
Subject: [PATCH] opensearch: port foreach -> range-based for

Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
---
 src/lib/opensearch/opensearchengine.cpp     | 4 +++-
 src/lib/opensearch/searchenginesdialog.cpp  | 3 ++-
 src/lib/opensearch/searchenginesmanager.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp
index a83c5af81..412bb8d46 100644
--- a/src/lib/opensearch/opensearchengine.cpp
+++ b/src/lib/opensearch/opensearchengine.cpp
@@ -644,8 +644,10 @@ void OpenSearchEngine::suggestionsObtained()
 
     QStringList out;
 
-    foreach (const QVariant &v, list.at(1).toList())
+    const auto items = list.at(1).toList();
+    for (const QVariant &v : items) {
         out.append(v.toString());
+    }
 
     emit suggestions(out);
 }
diff --git a/src/lib/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp
index 9659c02f8..4613fee9c 100644
--- a/src/lib/opensearch/searchenginesdialog.cpp
+++ b/src/lib/opensearch/searchenginesdialog.cpp
@@ -221,7 +221,8 @@ void SearchEnginesDialog::reloadEngines()
     ui->treeWidget->clear();
     const SearchEngine defaultEngine = mApp->searchEnginesManager()->defaultEngine();
 
-    foreach (const SearchEngine &en, m_manager->allEngines()) {
+    const auto engines = m_manager->allEngines();
+    for (const SearchEngine &en : engines) {
         QTreeWidgetItem* item = new QTreeWidgetItem();
         setEngine(item, en);
         changeItemToDefault(item, en == defaultEngine);
diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp
index 723a37c98..e9271a6af 100644
--- a/src/lib/opensearch/searchenginesmanager.cpp
+++ b/src/lib/opensearch/searchenginesmanager.cpp
@@ -119,7 +119,7 @@ SearchEngine SearchEnginesManager::engineForShortcut(const QString &shortcut)
         return returnEngine;
     }
 
-    foreach (const Engine &en, m_allEngines) {
+    for (const Engine &en : qAsConst(m_allEngines)) {
         if (en.shortcut == shortcut) {
             returnEngine = en;
             break;
@@ -217,7 +217,7 @@ void SearchEnginesManager::engineChangedImage()
         return;
     }
 
-    foreach (Engine e, m_allEngines) {
+    for (Engine e : qAsConst(m_allEngines)) {
         if (e.name == engine->name() &&
             e.url.contains(engine->searchUrl("%s").toString()) &&
             !engine->image().isNull()
@@ -280,7 +280,7 @@ void SearchEnginesManager::addEngineFromForm(const QVariantMap &formData, WebVie
     query.addQueryItem(inputName, QSL("SEARCH"));
 
     const QVariantList &inputs = formData.value(QSL("inputs")).toList();
-    foreach (const QVariant &pair, inputs) {
+    for (const QVariant &pair : inputs) {
         const QVariantList &list = pair.toList();
         if (list.size() != 2)
             continue;
@@ -496,7 +496,7 @@ void SearchEnginesManager::saveSettings()
     QSqlQuery query(SqlDatabase::instance()->database());
     query.exec("DELETE FROM search_engines");
 
-    foreach (const Engine &en, m_allEngines) {
+    for (const Engine &en : qAsConst(m_allEngines)) {
         query.prepare("INSERT INTO search_engines (name, icon, url, shortcut, suggestionsUrl, suggestionsParameters, postData) VALUES (?, ?, ?, ?, ?, ?, ?)");
         query.addBindValue(en.name);
         query.addBindValue(iconToBase64(en.icon));