From ea75f18c5bd3c3bfa89ec342989570f0b17a4df4 Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Mon, 30 Dec 2019 19:00:40 +0100 Subject: [PATCH] preferences: port foreach -> range-based for Signed-off-by: Juraj Oravec --- src/lib/preferences/acceptlanguage.cpp | 4 ++-- src/lib/preferences/autofillmanager.cpp | 4 ++-- src/lib/preferences/pluginsmanager.cpp | 2 +- src/lib/preferences/preferences.cpp | 6 ++++-- src/lib/preferences/thememanager.cpp | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/lib/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp index a8c4bc81b..6008fe9ec 100644 --- a/src/lib/preferences/acceptlanguage.cpp +++ b/src/lib/preferences/acceptlanguage.cpp @@ -87,10 +87,10 @@ AcceptLanguage::AcceptLanguage(QWidget* parent) Settings settings; settings.beginGroup("Language"); - QStringList langs = settings.value("acceptLanguage", defaultLanguage()).toStringList(); + const QStringList langs = settings.value("acceptLanguage", defaultLanguage()).toStringList(); settings.endGroup(); - foreach (const QString &code, langs) { + for (const QString &code : langs) { QString code_ = code; QLocale loc = QLocale(code_.replace(QLatin1Char('-'), QLatin1Char('_'))); QString label; diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp index 48e9fc8cf..6f50b8a95 100644 --- a/src/lib/preferences/autofillmanager.cpp +++ b/src/lib/preferences/autofillmanager.cpp @@ -82,10 +82,10 @@ void AutoFillManager::loadPasswords() ui->showPasswords->setText(tr("Show Passwords")); m_passwordsShown = false; - QVector allEntries = mApp->autoFill()->getAllFormData(); + const QVector allEntries = mApp->autoFill()->getAllFormData(); ui->treePass->clear(); - foreach (const PasswordEntry &entry, allEntries) { + for (const PasswordEntry &entry : allEntries) { QTreeWidgetItem* item = new QTreeWidgetItem(ui->treePass); item->setText(0, entry.host); item->setText(1, entry.username); diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index 7bd8f5c8b..6e66cdb04 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -101,7 +101,7 @@ void PluginsManager::refresh() const QList &allPlugins = mApp->plugins()->availablePlugins(); - foreach (const Plugins::Plugin &plugin, allPlugins) { + for (const Plugins::Plugin &plugin : allPlugins) { PluginSpec spec = plugin.pluginSpec; QListWidgetItem* item = new QListWidgetItem(ui->list); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index 24841b741..59e4b94c9 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -209,7 +209,8 @@ Preferences::Preferences(BrowserWindow* window) ui->activeProfile->setText("" + ProfileManager::currentProfile() + ""); ui->startProfile->addItem(startingProfile); - foreach (const QString &name, ProfileManager::availableProfiles()) { + const auto names = ProfileManager::availableProfiles(); + for (const QString &name : names) { if (startingProfile != name) { ui->startProfile->addItem(name); } @@ -295,7 +296,8 @@ Preferences::Preferences(BrowserWindow* window) ui->webRTCPublicIpOnly->setChecked(settings.value("WebRTCPublicIpOnly", true).toBool()); ui->dnsPrefetch->setChecked(settings.value("DNSPrefetch", true).toBool()); - foreach (int level, WebView::zoomLevels()) { + const auto levels = WebView::zoomLevels(); + for (int level : levels) { ui->defaultZoomLevel->addItem(QString("%1%").arg(level)); } ui->defaultZoomLevel->setCurrentIndex(settings.value("DefaultZoomLevel", WebView::zoomLevels().indexOf(100)).toInt()); diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp index e56a2f40c..78bf2c077 100644 --- a/src/lib/preferences/thememanager.cpp +++ b/src/lib/preferences/thememanager.cpp @@ -45,10 +45,10 @@ ThemeManager::ThemeManager(QWidget* parent, Preferences* preferences) const QStringList themePaths = DataPaths::allPaths(DataPaths::Themes); - foreach (const QString &path, themePaths) { + for (const QString &path : themePaths) { QDir dir(path); - QStringList list = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); - foreach (const QString &name, list) { + const QStringList list = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + for (const QString &name : list) { Theme themeInfo = parseTheme(dir.absoluteFilePath(name) + QLatin1Char('/'), name); if (!themeInfo.isValid) { continue;