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

Clean up where the QSettings is retrieved from.

Browse Source 
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>
This commit is contained in:
Eike Ziller
2013-04-10 14:15:26 +02:00
parent aff2518bd7
commit 46b9c03cbc
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

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

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

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

4
src/plugins/projectexplorer/settingsaccessor.cpp
View File

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

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

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