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

Core: Simplify system env setup code a bit

Browse Source 
Change-Id: Ic25c4b1e9371f9c46a2d95a243964f0a3ef1f878
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-10-09 14:04:56 +02:00
parent 6685f0255d
commit b8c7186a36
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -61,15 +61,8 @@ static CorePlugin *m_instance = nullptr;
const char kWarnCrashReportingSetting[] = "WarnCrashReporting"; const char kWarnCrashReportingSetting[] = "WarnCrashReporting";
const char kEnvironmentChanges[] = "Core/EnvironmentChanges"; const char kEnvironmentChanges[] = "Core/EnvironmentChanges";
void CorePlugin::setupSystemEnvironment()
{
m_instance->m_startupSystemEnvironment = Environment::systemEnvironment();
const EnvironmentItems changes = EnvironmentItem::fromStringList(
ICore::settings()->value(kEnvironmentChanges).toStringList());
setEnvironmentChanges(changes);
}
CorePlugin::CorePlugin() CorePlugin::CorePlugin()
: m_startupSystemEnvironment(Environment::systemEnvironment())
{ {
qRegisterMetaType<Id>(); qRegisterMetaType<Id>();
qRegisterMetaType<Utils::Text::Position>(); qRegisterMetaType<Utils::Text::Position>();
@@ -81,7 +74,10 @@ CorePlugin::CorePlugin()
qRegisterMetaType<Utils::KeyList>(); qRegisterMetaType<Utils::KeyList>();
qRegisterMetaType<Utils::OldStore>(); qRegisterMetaType<Utils::OldStore>();
m_instance = this; m_instance = this;
setupSystemEnvironment();
const EnvironmentItems changes = EnvironmentItem::fromStringList(
ICore::settings()->value(kEnvironmentChanges).toStringList());
setEnvironmentChanges(changes);
} }
CorePlugin::~CorePlugin() CorePlugin::~CorePlugin()
@@ -329,11 +325,6 @@ QObject *CorePlugin::remoteCommand(const QStringList & /* options */,
return res; return res;
} }
Environment CorePlugin::startupSystemEnvironment()
{
return m_instance->m_startupSystemEnvironment;
}
EnvironmentItems CorePlugin::environmentChanges() EnvironmentItems CorePlugin::environmentChanges()
{ {
return m_instance->m_environmentChanges; return m_instance->m_environmentChanges;

4
src/plugins/coreplugin/coreplugin.h
View File

@@ -50,7 +50,6 @@ public:
const QString &workingDirectory, const QString &workingDirectory,
const QStringList &args) override; const QStringList &args) override;
static Utils::Environment startupSystemEnvironment();
static Utils::EnvironmentItems environmentChanges(); static Utils::EnvironmentItems environmentChanges();
static void setEnvironmentChanges(const Utils::EnvironmentItems &changes); static void setEnvironmentChanges(const Utils::EnvironmentItems &changes);
static QString msgCrashpadInformation(); static QString msgCrashpadInformation();
@@ -71,7 +70,6 @@ private slots:
private: private:
static void addToPathChooserContextMenu(Utils::PathChooser *pathChooser, QMenu *menu); static void addToPathChooserContextMenu(Utils::PathChooser *pathChooser, QMenu *menu);
static void setupSystemEnvironment();
void checkSettings(); void checkSettings();
void warnAboutCrashReporing(); void warnAboutCrashReporing();
@@ -80,7 +78,7 @@ private:
Locator *m_locator = nullptr; Locator *m_locator = nullptr;
std::unique_ptr<SessionManager> m_sessionManager; std::unique_ptr<SessionManager> m_sessionManager;
FolderNavigationWidgetFactory *m_folderNavigationWidgetFactory = nullptr; FolderNavigationWidgetFactory *m_folderNavigationWidgetFactory = nullptr;
Utils::Environment m_startupSystemEnvironment; const Utils::Environment m_startupSystemEnvironment;
Utils::EnvironmentItems m_environmentChanges; Utils::EnvironmentItems m_environmentChanges;
}; };