From 38b51667b5ba74fc5a28172e251c9ba4c0398e32 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Tue, 26 Feb 2019 07:04:22 +0100
Subject: [Kconfig] Compile without foreach

Summary: compile without foreach

Test Plan: Unittest Ok as previously

Reviewers: dfaure

Reviewed By: dfaure

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D19326
---
 src/kconf_update/kconf_update.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/kconf_update/kconf_update.cpp')

diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index 89a742ec..c389cda2 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -146,7 +146,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
         updateAll = true;
     }
 
-    foreach (const QString& file, updateFiles) {
+    for (const QString& file : qAsConst(updateFiles)) {
         updateFile(file);
     }
 
@@ -211,11 +211,11 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
     QStringList result;
 
     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
-    Q_FOREACH (const QString &d, dirs) {
+    for (const QString &d : dirs) {
         const QDir dir(d);
 
         const QStringList fileNames = dir.entryList(QStringList(QStringLiteral("*.upd")));
-        Q_FOREACH (const QString &fileName, fileNames) {
+        for (const QString &fileName : fileNames) {
             const QString file = dir.filePath(fileName);
             QFileInfo info(file);
 
@@ -637,12 +637,14 @@ void KonfUpdate::copyOrMoveGroup(const QStringList &srcGroupPath, const QStringL
     KConfigGroup cg = KConfigUtils::openGroup(m_oldConfig1, srcGroupPath);
 
     // Keys
-    Q_FOREACH (const QString &key, cg.keyList()) {
+    const QStringList lstKeys = cg.keyList();
+    for (const QString &key : lstKeys) {
         copyOrMoveKey(srcGroupPath, key, dstGroupPath, key);
     }
 
     // Subgroups
-    Q_FOREACH (const QString &group, cg.groupList()) {
+    const QStringList lstGroup = cg.groupList();
+    for (const QString &group : lstGroup) {
         const QStringList groupPath(group);
         copyOrMoveGroup(srcGroupPath + groupPath, dstGroupPath + groupPath);
     }
@@ -737,7 +739,8 @@ void KonfUpdate::copyGroup(const KConfigGroup &cg1, KConfigGroup &cg2)
     }
 
     // Copy subgroups
-    Q_FOREACH (const QString &group, cg1.groupList()) {
+    const QStringList lstGroup = cg1.groupList();
+    for (const QString &group : lstGroup) {
         copyGroup(&cg1, group, &cg2, group);
     }
 }
@@ -935,7 +938,8 @@ void KonfUpdate::gotScript(const QString &_script)
         KConfigGroup dstCg = KConfigUtils::openGroup(m_newConfig, m_newGroup);
         copyGroup(srcCg, dstCg);
     }
-    Q_FOREACH (const QString &group, scriptOutConfig.groupList()) {
+    const QStringList lstGroup = scriptOutConfig.groupList();
+    for (const QString &group : lstGroup) {
         copyGroup(&scriptOutConfig, group, m_newConfig, group);
     }
 }
-- 
cgit v1.2.1