feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Make Environment::setEnglishOutput a proper member function

Browse Source 
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 <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-20 11:57:21 +02:00
parent 2be8061930
commit 77d7b24326
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/environment.cpp
View File

@@ -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,

3
src/libs/utils/environment.h
View File

@@ -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<bool(const FilePath &)>;
FilePath searchInPath(const QString &executable,
const FilePaths &additionalDirs = FilePaths(),

2
src/plugins/clangtools/executableinfo.cpp
View File

@@ -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);

2
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -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] ");
});

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -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);

2
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -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});

2
src/plugins/coreplugin/patchtool.cpp
View File

@@ -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

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -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();

2
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -153,7 +153,7 @@ void AbstractProcessStep::setEnvironmentModifier(const std::function<void (Envir
void AbstractProcessStep::setUseEnglishOutput()
{
d->m_environmentModifier = [](Environment &env) { Environment::setupEnglishOutput(&env); };
d->m_environmentModifier = [](Environment &env) { env.setupEnglishOutput(); };
}
void AbstractProcessStep::setCommandLineProvider(const std::function<CommandLine()> &provider)

2
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -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);

2
src/plugins/projectexplorer/makestep.cpp
View File

@@ -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<ToolChain *> tcs = preferredToolChains(target()->kit());