From 77d7b24326cec920be8afa29b495cfcae52ee1c3 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 20 May 2021 11:57:21 +0200 Subject: [PATCH] Utils: Make Environment::setEnglishOutput a proper member function The previous indirection was useful as long as they were overloads for QProcessEnvironment and QStringList, but these are gone now. Change-Id: I5066bd2e72fd06948a5cc7bbac6dda9006db96ed Reviewed-by: Christian Kandeler --- src/libs/utils/environment.cpp | 7 +++---- src/libs/utils/environment.h | 3 ++- src/plugins/clangtools/executableinfo.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp | 2 +- src/plugins/cmakeprojectmanager/cmaketool.cpp | 2 +- src/plugins/coreplugin/patchtool.cpp | 2 +- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- src/plugins/projectexplorer/abstractprocessstep.cpp | 2 +- src/plugins/projectexplorer/gcctoolchain.cpp | 2 +- src/plugins/projectexplorer/makestep.cpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 48092d2b11d..e02a407dbc9 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -130,11 +130,10 @@ Environment Environment::systemEnvironment() return *staticSystemEnvironment(); } -void Environment::setupEnglishOutput(Environment *environment) +void Environment::setupEnglishOutput() { - QTC_ASSERT(environment, return); - environment->set("LC_MESSAGES", "en_US.utf8"); - environment->set("LANGUAGE", "en_US:en"); + set("LC_MESSAGES", "en_US.utf8"); + set("LANGUAGE", "en_US:en"); } FilePath Environment::searchInDirectory(const QStringList &execs, const FilePath &directory, diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index d4aaae9655c..75e7aeb4aa9 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -45,7 +45,6 @@ public: using NameValueDictionary::NameValueDictionary; static Environment systemEnvironment(); - static void setupEnglishOutput(Environment *environment); QProcessEnvironment toProcessEnvironment() const; @@ -58,6 +57,8 @@ public: void prependOrSetLibrarySearchPath(const QString &value); void prependOrSetLibrarySearchPaths(const QStringList &values); + void setupEnglishOutput(); + using PathFilter = std::function; FilePath searchInPath(const QString &executable, const FilePaths &additionalDirs = FilePaths(), diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp index 71d9554056c..3ac7693577e 100644 --- a/src/plugins/clangtools/executableinfo.cpp +++ b/src/plugins/clangtools/executableinfo.cpp @@ -52,7 +52,7 @@ static QString runExecutable(const Utils::CommandLine &commandLine, SynchronousProcess cpp; Environment env = Environment::systemEnvironment(); - Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); cpp.setEnvironment(env); cpp.setCommand(commandLine); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index b6cf45b9931..42015dd72c1 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -192,7 +192,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) : setEnvironmentModifier([](Environment &env) { const QString ninjaProgressString = "[%f/%t "; // ninja: [33/100 - Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); if (!env.expandedValueForKey("NINJA_STATUS").startsWith(ninjaProgressString)) env.set("NINJA_STATUS", ninjaProgressString + "%o/sec] "); }); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 5d32fafbac0..921f1c8c75e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -202,7 +202,7 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config) cmake.setTimeoutS(5); cmake.setDisableUnixTerminal(); Environment env = Environment::systemEnvironment(); - Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); cmake.setEnvironment(env); cmake.setTimeOutMessageBoxEnabled(false); diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 149086b44eb..81b06387a40 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -197,7 +197,7 @@ void CMakeTool::runCMake(SynchronousProcess &cmake, const QStringList &args, int cmake.setTimeoutS(timeoutS); cmake.setDisableUnixTerminal(); Environment env = Environment::systemEnvironment(); - Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); cmake.setEnvironment(env); cmake.setTimeOutMessageBoxEnabled(false); cmake.setCommand({cmakeExecutable(), args}); diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index b34c73bed7e..345673e1172 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -84,7 +84,7 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect if (!workingDirectory.isEmpty()) patchProcess.setWorkingDirectory(workingDirectory); Environment env = Environment::systemEnvironment(); - Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); patchProcess.setEnvironment(env); QStringList args; // Add argument 'apply' when git is used as patch command since git 2.5/Windows diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 3281aa431b2..d2f339b0e5c 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4976,7 +4976,7 @@ CoreInfo CoreInfo::readExecutableNameFromCore(const Runnable &debugger, const QS SynchronousProcess proc; Environment envLang(QProcess::systemEnvironment()); - Environment::setupEnglishOutput(&envLang); + envLang.setupEnglishOutput(); proc.setEnvironment(envLang); proc.setCommand({debugger.executable, args}); proc.runBlocking(); diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index fe9b7d1c6ef..8156eb02b28 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -153,7 +153,7 @@ void AbstractProcessStep::setEnvironmentModifier(const std::functionm_environmentModifier = [](Environment &env) { Environment::setupEnglishOutput(&env); }; + d->m_environmentModifier = [](Environment &env) { env.setupEnglishOutput(); }; } void AbstractProcessStep::setCommandLineProvider(const std::function &provider) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index b881b889777..ba9a5b9fb97 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -83,7 +83,7 @@ static QByteArray runGcc(const FilePath &gcc, const QStringList &arguments, cons SynchronousProcess cpp; Environment environment(env); - Environment::setupEnglishOutput(&environment); + environment.setupEnglishOutput(); cpp.setEnvironment(environment); cpp.setTimeoutS(10); diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 8f41e3bd6ba..ad44e822fb4 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -273,7 +273,7 @@ bool MakeStep::userArgsContainsJobCount() const Environment MakeStep::makeEnvironment() const { Environment env = buildEnvironment(); - Utils::Environment::setupEnglishOutput(&env); + env.setupEnglishOutput(); if (makeCommand().isEmpty()) { // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose const QList tcs = preferredToolChains(target()->kit());