From f0e7ab6228cc03e55239ebb76c02a3132a37cde2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 4 Aug 2023 18:47:35 +0200 Subject: [PATCH] UnixPtyProcess: Get rid of foreach Change-Id: I9ca9092c874960e63d6a29bcd11181bb571c3615 Reviewed-by: Reviewed-by: Marcus Tillmanns --- src/libs/3rdparty/libptyqt/unixptyprocess.cpp | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp index 4c67ee28fb0..b40c8933ac7 100644 --- a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp +++ b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp @@ -184,34 +184,33 @@ bool UnixPtyProcess::startProcess(const QString &shellPath, m_readMasterNotify->disconnect(); }); - QStringList defaultVars; - - defaultVars.append("TERM=xterm-256color"); - defaultVars.append("ITERM_PROFILE=Default"); - defaultVars.append("XPC_FLAGS=0x0"); - defaultVars.append("XPC_SERVICE_NAME=0"); - defaultVars.append("LANG=en_US.UTF-8"); - defaultVars.append("LC_ALL=en_US.UTF-8"); - defaultVars.append("LC_CTYPE=UTF-8"); - defaultVars.append("INIT_CWD=" + QCoreApplication::applicationDirPath()); - defaultVars.append("COMMAND_MODE=unix2003"); - defaultVars.append("COLORTERM=truecolor"); + const QStringList defaultVars = { + "TERM=xterm-256color", + "ITERM_PROFILE=Default", + "XPC_FLAGS=0x0", + "XPC_SERVICE_NAME=0", + "LANG=en_US.UTF-8", + "LC_ALL=en_US.UTF-8", + "LC_CTYPE=UTF-8", + "INIT_CWD=" + QCoreApplication::applicationDirPath(), + "COMMAND_MODE=unix2003", + "COLORTERM=truecolor" + }; QStringList varNames; - foreach (QString line, environment) { + for (const QString &line : std::as_const(environment)) varNames.append(line.split("=").first()); - } //append default env vars only if they don't exists in current env - foreach (QString defVar, defaultVars) { + for (const QString &defVar : defaultVars) { if (!varNames.contains(defVar.split("=").first())) environment.append(defVar); } QProcessEnvironment envFormat; - foreach (QString line, environment) { + for (const QString &line : std::as_const(environment)) envFormat.insert(line.split("=").first(), line.split("=").last()); - } + m_shellProcess.setWorkingDirectory(workingDir); m_shellProcess.setProcessEnvironment(envFormat); m_shellProcess.setReadChannel(QProcess::StandardOutput);