From c4e6493ff1c3f601b38b3a67993d48e725efb04f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 5 Oct 2022 13:17:43 +0200 Subject: [PATCH] RemoteLinux: Replace foreach with ranged for loop Change-Id: Iee251639c20131c8fc2fd2e182b131a9786411c7 Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp | 3 ++- src/plugins/remotelinux/tarpackagecreationstep.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp index 886249d2753..207c092458a 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp @@ -43,7 +43,8 @@ QString RemoteLinuxEnvironmentAspect::userEnvironmentChangesAsString() const { QString env; QString placeHolder = QLatin1String("%1=%2 "); - foreach (const Utils::EnvironmentItem &item, userEnvironmentChanges()) + const Utils::EnvironmentItems items = userEnvironmentChanges(); + for (const Utils::EnvironmentItem &item : items) env.append(placeHolder.arg(item.name, item.value)); return env.mid(0, env.size() - 1); } diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index 1098896bdc0..ca9c0001a2a 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -379,9 +379,9 @@ bool TarPackageCreationStep::appendFile(QFile &tarFile, const QFileInfo &fileInf return false; } if (fileInfo.isDir()) { - QDir dir(fileInfo.absoluteFilePath()); - foreach (const QString &fileName, - dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)) { + const QDir dir(fileInfo.absoluteFilePath()); + const QStringList files = dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); + for (const QString &fileName : files) { const QString thisLocalFilePath = dir.path() + QLatin1Char('/') + fileName; const QString thisRemoteFilePath = remoteFilePath + QLatin1Char('/') + fileName; if (!appendFile(tarFile, QFileInfo(thisLocalFilePath), thisRemoteFilePath))