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

Utils: Remove two of the Environment::setupEnglishOutput overloads

Browse Source 
We standardize on Utils::Environment nowadays.

Change-Id: Icaf2fac21d237686a63cb60fdaf1b5900bf9fe1c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-14 09:33:57 +02:00
parent c81c648834
commit f23b27ded6
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,31 +130,11 @@ Environment Environment::systemEnvironment()
return *staticSystemEnvironment(); return *staticSystemEnvironment();
} }
const char lcMessages[] = "LC_MESSAGES";
const char language[] = "LANGUAGE";
const char englishLocale[] = "en_US.utf8";
const char languageEnglishLocales[] = "en_US:en";
void Environment::setupEnglishOutput(Environment *environment) void Environment::setupEnglishOutput(Environment *environment)
{ {
QTC_ASSERT(environment, return); QTC_ASSERT(environment, return);
environment->set(lcMessages, englishLocale); environment->set("LC_MESSAGES", "en_US.utf8");
environment->set(language, languageEnglishLocales); environment->set("LANGUAGE", "en_US:en");
}
void Environment::setupEnglishOutput(QProcessEnvironment *environment)
{
QTC_ASSERT(environment, return);
environment->insert(lcMessages, englishLocale);
environment->insert(language, languageEnglishLocales);
}
void Environment::setupEnglishOutput(QStringList *environment)
{
QTC_ASSERT(environment, return);
Environment env(*environment);
setupEnglishOutput(&env);
*environment = env.toStringList();
} }
FilePath Environment::searchInDirectory(const QStringList &execs, const FilePath &directory, FilePath Environment::searchInDirectory(const QStringList &execs, const FilePath &directory,

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

@@ -31,12 +31,10 @@
#include "namevalueitem.h" #include "namevalueitem.h"
#include "optional.h" #include "optional.h"
#include <QMap>
#include <QStringList> #include <QStringList>
#include <functional> #include <functional>
QT_FORWARD_DECLARE_CLASS(QDebug)
QT_FORWARD_DECLARE_CLASS(QProcessEnvironment) QT_FORWARD_DECLARE_CLASS(QProcessEnvironment)
namespace Utils { namespace Utils {
@@ -48,8 +46,6 @@ public:
static Environment systemEnvironment(); static Environment systemEnvironment();
static void setupEnglishOutput(Environment *environment); static void setupEnglishOutput(Environment *environment);
static void setupEnglishOutput(QProcessEnvironment *environment);
static void setupEnglishOutput(QStringList *environment);
QProcessEnvironment toProcessEnvironment() const; QProcessEnvironment toProcessEnvironment() const;