From 7cb7e221bda026c0b12222107e26d5ba2f86ad4d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 6 May 2021 15:26:33 +0200 Subject: [PATCH] ClangTools: Avoid one use of mutable ProcessArgs::iterator splitArgs() is more compact and sufficient here. Change-Id: I789b9ee37899b3d26bd4fabea7ab1756a6d8ac2b Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolsutils.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp index 7baabff081b..1e64403b67d 100644 --- a/src/plugins/clangtools/clangtoolsutils.cpp +++ b/src/plugins/clangtools/clangtoolsutils.cpp @@ -321,21 +321,12 @@ ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId) return configs.configWithId(diagConfigId); } -QStringList splitArgs(QString &argsString) -{ - QStringList result; - Utils::ProcessArgs::ArgIterator it(&argsString); - while (it.next()) - result.append(it.value()); - return result; -} - -QStringList extraOptions(const char *envVar) +static QStringList extraOptions(const char *envVar) { if (!qEnvironmentVariableIsSet(envVar)) return QStringList(); - QString arguments = QString::fromLocal8Bit(qgetenv(envVar)); - return splitArgs(arguments); + QString arguments = qEnvironmentVariable(envVar); + return Utils::ProcessArgs::splitArgs(arguments); } QStringList extraClangToolsPrependOptions()