From 46b9c03cbcc49b31bc9c6e4e30b516cf537e309f Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Wed, 10 Apr 2013 14:15:26 +0200
Subject: [PATCH] Clean up where the QSettings is retrieved from.
The settings in the plugin manager (local/global) are where the plugin
manager is supposed to look for its settings, which has per se nothing
to do where Qt Creator wants other settings to be written to.
All Qt Creator code should use ICore::settings() for that instead.
Change-Id: I28bd855ae6cbcdf8d19017eb44f178e4624a1a61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 4 ++--
src/plugins/projectexplorer/kitmanager.cpp | 2 +-
src/plugins/projectexplorer/settingsaccessor.cpp | 4 ++--
src/plugins/projectexplorer/toolchainmanager.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 038884ca2d9..303b8e889bd 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -224,13 +224,13 @@ QVariantMap DeviceManager::toMap() const
Utils::FileName DeviceManager::settingsFilePath(const QString &extension)
{
- return Utils::FileName::fromString(QFileInfo(ExtensionSystem::PluginManager::settings()->fileName()).absolutePath() + extension);
+ return Utils::FileName::fromString(QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + extension);
}
Utils::FileName DeviceManager::systemSettingsFilePath(const QString &deviceFileRelativePath)
{
return Utils::FileName::fromString(
- QFileInfo(ExtensionSystem::PluginManager::globalSettings()->fileName()).absolutePath()
+ QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath()
+ deviceFileRelativePath);
}
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 911d90fb645..122dc06340d 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -55,7 +55,7 @@ using Utils::PersistentSettingsReader;
static Utils::FileName settingsFileName()
{
- QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
+ QFileInfo settingsLocation(Core::ICore::settings()->fileName());
return Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String(KIT_FILENAME));
}
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 439dfbb380c..19549f9ded4 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -2620,7 +2620,7 @@ static QString maddeRoot(const QString &qmakePath)
void Version11Handler::parseQtversionFile()
{
- QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
+ QFileInfo settingsLocation(Core::ICore::settings()->fileName());
Utils::FileName fileName = Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/qtversion.xml"));
Utils::PersistentSettingsReader reader;
if (!reader.load(fileName)) {
@@ -2663,7 +2663,7 @@ void Version11Handler::parseQtversionFile()
void Version11Handler::parseToolChainFile()
{
- QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
+ QFileInfo settingsLocation(Core::ICore::settings()->fileName());
Utils::FileName fileName = Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/toolChains.xml"));
Utils::PersistentSettingsReader reader;
if (!reader.load(fileName)) {
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 53728931de7..4f29847aa64 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -58,7 +58,7 @@ using Utils::PersistentSettingsReader;
static Utils::FileName settingsFileName(const QString &path)
{
- QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
+ QFileInfo settingsLocation(Core::ICore::settings()->fileName());
return Utils::FileName::fromString(settingsLocation.absolutePath() + path);
}
--
GitLab