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

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

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

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

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