Make PluginManager mostly static.

Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index c89ae570fa..b87a38f8da 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -58,8 +58,7 @@ using Utils::PersistentSettingsReader;
 
 static QString settingsFileName()
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QFileInfo settingsLocation(pm->settings()->fileName());
+    QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
     return settingsLocation.absolutePath() + QLatin1String(TOOLCHAIN_FILENAME);
 }
 
@@ -159,8 +158,7 @@ void ToolChainManager::restoreToolChains()
 
     // Then auto detect
     QList<ToolChain *> detectedTcs;
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QList<ToolChainFactory *> factories = pm->getObjects<ToolChainFactory>();
+    QList<ToolChainFactory *> factories = ExtensionSystem::PluginManager::getObjects<ToolChainFactory>();
     foreach (ToolChainFactory *f, factories)
         detectedTcs.append(f->autoDetect());
 
@@ -248,8 +246,7 @@ QList<ToolChain *> ToolChainManager::restoreToolChains(const QString &fileName)
                                   Utils::FileName::fromString(data.value(pathKey).toString()));
     }
 
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QList<ToolChainFactory *> factories = pm->getObjects<ToolChainFactory>();
+    QList<ToolChainFactory *> factories = ExtensionSystem::PluginManager::getObjects<ToolChainFactory>();
 
     count = data.value(QLatin1String(TOOLCHAIN_COUNT_KEY), 0).toInt();
     for (int i = 0; i < count; ++i) {