Make PluginManager mostly static.

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

1 files changed, 4 insertions, 7 deletions

diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index deeb208f74..16aebe5b3c 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -119,7 +119,6 @@ BuildManagerPrivate::BuildManagerPrivate() :
 BuildManager::BuildManager(ProjectExplorerPlugin *parent, QAction *cancelBuildAction)
     : QObject(parent), d(new BuildManagerPrivate)
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     d->m_projectExplorerPlugin = parent;
 
     connect(&d->m_watcher, SIGNAL(finished()),
@@ -136,11 +135,11 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent, QAction *cancelBuildAc
             this, SLOT(aboutToRemoveProject(ProjectExplorer::Project*)));
 
     d->m_outputWindow = new Internal::CompileOutputWindow(this, cancelBuildAction);
-    pm->addObject(d->m_outputWindow);
+    ExtensionSystem::PluginManager::addObject(d->m_outputWindow);
 
     d->m_taskHub = ProjectExplorerPlugin::instance()->taskHub();
     d->m_taskWindow = new Internal::TaskWindow(d->m_taskHub);
-    pm->addObject(d->m_taskWindow);
+    ExtensionSystem::PluginManager::addObject(d->m_taskWindow);
 
     qRegisterMetaType<ProjectExplorer::BuildStep::OutputFormat>();
     qRegisterMetaType<ProjectExplorer::BuildStep::OutputNewlineSetting>();
@@ -168,12 +167,10 @@ void BuildManager::extensionsInitialized()
 BuildManager::~BuildManager()
 {
     cancel();
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-
-    pm->removeObject(d->m_taskWindow);
+    ExtensionSystem::PluginManager::removeObject(d->m_taskWindow);
     delete d->m_taskWindow;
 
-    pm->removeObject(d->m_outputWindow);
+    ExtensionSystem::PluginManager::removeObject(d->m_outputWindow);
     delete d->m_outputWindow;
 
     delete d;