From 0b09fe1bcfc34a8111ed6f1192aaac9ee1dd9e37 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sat, 24 Oct 2020 11:45:30 +0200 Subject: [PATCH] Solve clazy warnings about range based for loops --- applets/kicker/plugin/actionlist.cpp | 2 +- applets/kicker/plugin/kastatsfavoritesmodel.cpp | 2 +- components/containmentlayoutmanager/appletslayout.cpp | 2 +- components/containmentlayoutmanager/gridlayoutmanager.cpp | 4 ++-- components/containmentlayoutmanager/itemcontainer.cpp | 2 +- .../shellprivate/interactiveconsole/interactiveconsole.cpp | 2 +- .../shellprivate/widgetexplorer/plasmaappletitemmodel.cpp | 2 +- gmenu-dbusmenu-proxy/menu.cpp | 2 +- kcms/feedback/feedback.cpp | 2 +- kcms/style/gtkthemesmodel.cpp | 4 ++-- libdbusmenuqt/dbusmenuimporter.cpp | 4 ++-- startkde/plasma-session/plasma-autostart-list/main.cpp | 2 +- startkde/startplasma.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp index cf8fcb971..4e7f0a072 100644 --- a/applets/kicker/plugin/actionlist.cpp +++ b/applets/kicker/plugin/actionlist.cpp @@ -259,7 +259,7 @@ QVariantList systemSettingsActions() return list; } - for (const QString &id : ids) { + for (const QString &id : qAsConst(ids)) { KService::Ptr service = KService::serviceByStorageId(id); if (!service || !service->isValid()) { continue; diff --git a/applets/kicker/plugin/kastatsfavoritesmodel.cpp b/applets/kicker/plugin/kastatsfavoritesmodel.cpp index b9c59ab28..d8b5d0b5f 100644 --- a/applets/kicker/plugin/kastatsfavoritesmodel.cpp +++ b/applets/kicker/plugin/kastatsfavoritesmodel.cpp @@ -416,7 +416,7 @@ public: { QStringList ids; - for (const auto& item: m_items) { + for (const auto& item: qAsConst(m_items)) { ids << item.value(); } diff --git a/components/containmentlayoutmanager/appletslayout.cpp b/components/containmentlayoutmanager/appletslayout.cpp index 35c010447..432fe78f9 100644 --- a/components/containmentlayoutmanager/appletslayout.cpp +++ b/components/containmentlayoutmanager/appletslayout.cpp @@ -481,7 +481,7 @@ void AppletsLayout::componentComplete() m_layoutManager->parseLayout(m_containment->config().readEntry(m_configKey, "")); } - QList appletObjects = m_containmentItem->property("applets").value >(); + const QList appletObjects = m_containmentItem->property("applets").value >(); for (auto *obj : appletObjects) { PlasmaQuick::AppletQuickItem *appletItem = qobject_cast(obj); diff --git a/components/containmentlayoutmanager/gridlayoutmanager.cpp b/components/containmentlayoutmanager/gridlayoutmanager.cpp index c0dc4af99..377e6cf0a 100644 --- a/components/containmentlayoutmanager/gridlayoutmanager.cpp +++ b/components/containmentlayoutmanager/gridlayoutmanager.cpp @@ -53,7 +53,7 @@ QString GridLayoutManager::serializeLayout() const void GridLayoutManager::parseLayout(const QString &savedLayout) { m_parsedConfig.clear(); - QStringList itemsConfigs = savedLayout.split(QLatin1Char(';')); + const QStringList itemsConfigs = savedLayout.split(QLatin1Char(';')); for (const auto &itemString : itemsConfigs) { QStringList itemConfig = itemString.split(QLatin1Char(':')); @@ -153,7 +153,7 @@ void GridLayoutManager::resetLayoutFromConfig() } } - for (auto *item : missingItems) { + for (auto *item : qAsConst(missingItems)) { // NOTE: do not use positionItemAndAssign here, because we do not want to emit layoutNeedsSaving, to not save after resize positionItem(item); assignSpaceImpl(item); diff --git a/components/containmentlayoutmanager/itemcontainer.cpp b/components/containmentlayoutmanager/itemcontainer.cpp index bfdd632cf..1442b7ba7 100644 --- a/components/containmentlayoutmanager/itemcontainer.cpp +++ b/components/containmentlayoutmanager/itemcontainer.cpp @@ -409,7 +409,7 @@ void ItemContainer::componentComplete() syncChildItemsGeometry(size()); } - for (auto *o : m_contentData) { + for (auto *o : qAsConst(m_contentData)) { QQuickItem *item = qobject_cast(o); if (item) { item->setParentItem(m_contentItem); diff --git a/components/shellprivate/interactiveconsole/interactiveconsole.cpp b/components/shellprivate/interactiveconsole/interactiveconsole.cpp index ae954e8af..2366f85b9 100644 --- a/components/shellprivate/interactiveconsole/interactiveconsole.cpp +++ b/components/shellprivate/interactiveconsole/interactiveconsole.cpp @@ -377,7 +377,7 @@ void InteractiveConsole::populateTemplatesMenu() return left.name() < right.name(); }); KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LayoutTemplate")); - for (const auto &templateMetaData : templates){ + for (const auto &templateMetaData : qAsConst(templates)){ package.setPath(templateMetaData.pluginId()); const QString scriptFile = package.filePath("mainscript"); if (!scriptFile.isEmpty()) { diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp index b558053f4..f8cb4b0f0 100644 --- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp +++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp @@ -141,7 +141,7 @@ bool PlasmaAppletItem::matches(const QString &pattern) const const QString keywordsList = KPluginMetaData::readTranslatedString(m_info.rawData(), QStringLiteral("Keywords")); const auto keywords = keywordsList.splitRef(QLatin1Char(';'), Qt::SkipEmptyParts); - for (const auto keyword : keywords) { + for (const auto &keyword : keywords) { if (keyword.startsWith(pattern, Qt::CaseInsensitive)) { return true; } diff --git a/gmenu-dbusmenu-proxy/menu.cpp b/gmenu-dbusmenu-proxy/menu.cpp index 8f986df0f..f3fb1e11f 100644 --- a/gmenu-dbusmenu-proxy/menu.cpp +++ b/gmenu-dbusmenu-proxy/menu.cpp @@ -90,7 +90,7 @@ void Menu::start(uint id) const bool hadMenu = !m_menus.isEmpty(); const auto menus = reply.value(); - for (auto menu : menus) { + for (const auto &menu : menus) { m_menus[menu.id].append(menus); } diff --git a/kcms/feedback/feedback.cpp b/kcms/feedback/feedback.cpp index 4a5bed705..46b8ce84b 100644 --- a/kcms/feedback/feedback.cpp +++ b/kcms/feedback/feedback.cpp @@ -61,7 +61,7 @@ Feedback::Feedback(QObject *parent, const QVariantList &args) QStringLiteral("1.0"), i18n("Configure user feedback settings"), KAboutLicense::LGPL)); QVector processes; - for (const auto exec: s_programs.keys()) { + for (const auto &exec: s_programs.keys()) { QProcess* p = new QProcess(this); p->setProgram(exec); p->setArguments({QStringLiteral("--feedback")}); diff --git a/kcms/style/gtkthemesmodel.cpp b/kcms/style/gtkthemesmodel.cpp index d100601d4..c3c0c4f78 100644 --- a/kcms/style/gtkthemesmodel.cpp +++ b/kcms/style/gtkthemesmodel.cpp @@ -134,8 +134,8 @@ QStringList GtkThemesModel::possiblePathsToThemes() QStandardPaths::LocateDirectory); themesLocationsPaths << QDir::homePath() + QStringLiteral("/.themes"); - for (const QString& themesLocationPath : themesLocationsPaths) { - QStringList possibleThemesDirectoriesNames = QDir(themesLocationPath).entryList(QDir::NoDotAndDotDot | QDir::AllDirs); + for (const QString& themesLocationPath : qAsConst(themesLocationsPaths)) { + const QStringList possibleThemesDirectoriesNames = QDir(themesLocationPath).entryList(QDir::NoDotAndDotDot | QDir::AllDirs); for (const QString &possibleThemeDirectoryName : possibleThemesDirectoriesNames) { possibleThemesPaths += themesLocationPath + '/' + possibleThemeDirectoryName; } diff --git a/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimporter.cpp index cab0a26ed..135a834f4 100644 --- a/libdbusmenuqt/dbusmenuimporter.cpp +++ b/libdbusmenuqt/dbusmenuimporter.cpp @@ -404,7 +404,7 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher) //remove outdated actions QSet newDBusMenuItemIds; newDBusMenuItemIds.reserve(rootItem.children.count()); - for (const DBusMenuLayoutItem &item: rootItem.children) { + for (const DBusMenuLayoutItem &item: qAsConst(rootItem.children)) { newDBusMenuItemIds << item.id; } for (QAction *action: menu->actions()) { @@ -422,7 +422,7 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher) } //insert or update new actions into our menu - for (const DBusMenuLayoutItem &dbusMenuItem: rootItem.children) { + for (const DBusMenuLayoutItem &dbusMenuItem: qAsConst(rootItem.children)) { DBusMenuImporterPrivate::ActionForId::Iterator it = d->m_actionForId.find(dbusMenuItem.id); QAction *action = nullptr; if (it == d->m_actionForId.end()) { diff --git a/startkde/plasma-session/plasma-autostart-list/main.cpp b/startkde/plasma-session/plasma-autostart-list/main.cpp index 6835b1832..0eaefa437 100644 --- a/startkde/plasma-session/plasma-autostart-list/main.cpp +++ b/startkde/plasma-session/plasma-autostart-list/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) asN.setPhase(phase); cout << "phase: " << phase << '\n'; bool foundThings = true; - for (auto asi : asN.startList()) { + for (const auto &asi : asN.startList()) { foundThings = false; cout << "- " << asi.name << ' ' << asi.service; if (!asi.startAfter.isEmpty()) diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index dbe4b58fd..77ea56cd1 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -476,7 +476,7 @@ void waitForKonqi() services = allServices(QLatin1String("org.kde.drkonqi-")); if (wait_drkonqi_counter.elapsed() >= wait_drkonqi_timeout) { // ask remaining drkonqis to die in a graceful way - for (const auto &service: services) { + for (const auto &service: qAsConst(services)) { QDBusInterface iface(service, QStringLiteral("/MainApplication")); iface.call(QStringLiteral("quit")); }