Less iterations

gilmoa · Nov 21, 2017 · 18e5d5f · 18e5d5f
1 parent 8592cd0
commit 18e5d5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/src/Host.cpp b/src/Host.cpp
@@ -466,18 +466,10 @@ void Host::reenableAllTriggers()
 
 QPair<QString, QString> Host::getSearchEngine()
 {
-    auto ret = QPair<QString, QString>();
-    ret.first = QString("Google");
-    ret.second = mSearchEngineData[ret.first];
-
-    auto iterator = mSearchEngineData.constFind(mSearchEngineName);
-    if(iterator != mSearchEngineData.end())
-    {
-        ret.first = iterator.key();
-        ret.second = iterator.value();
-    }
-
-    return ret;
+    if(mSearchEngineData.contains(mSearchEngineName))
+        return qMakePair(mSearchEngineName, mSearchEngineData.value(mSearchEngineName));
+    else
+        return qMakePair(QStringLiteral("Google"), mSearchEngineData.value(QStringLiteral("Google")));
 }
 
 void Host::send(QString cmd, bool wantPrint, bool dontExpandAliases)

diff --git a/src/dlgProfilePreferences.cpp b/src/dlgProfilePreferences.cpp
@@ -425,11 +425,7 @@ void dlgProfilePreferences::loadEditorTab()
     }
 
     // search engine load
-    // populate combobox
-    for(auto engineText : mpHost->mSearchEngineData.keys())
-    {
-        search_engine_combobox->addItem(engineText);
-    }
+    search_engine_combobox->addItems(QStringList(mpHost->mSearchEngineData.keys()));
 
     connect(search_engine_combobox, SIGNAL(currentTextChanged(const QString)), this, SLOT(slot_search_engine_edited(const QString)));