PluginManager: Do not use instance() when that is not needed

Change-Id: I68e1b20561098c375557be6db1fb528e0ae040f6
Reviewed-by: hjk <hjk121@nokiamail.com>

13 files changed, 21 insertions, 22 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 5a744264c0..22b58fcea8 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -573,7 +573,7 @@ bool CMakeProject::fromMap(const QVariantMap &map)
 
         t->addBuildConfiguration(bc);
 
-        DeployConfigurationFactory *fac = ExtensionSystem::PluginManager::instance()->getObject<DeployConfigurationFactory>();
+        DeployConfigurationFactory *fac = ExtensionSystem::PluginManager::getObject<DeployConfigurationFactory>();
         ProjectExplorer::DeployConfiguration *dc = fac->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
         t->addDeployConfiguration(dc);
 
@@ -630,14 +630,14 @@ bool CMakeProject::fromMap(const QVariantMap &map)
 bool CMakeProject::setupTarget(Target *t)
 {
     CMakeBuildConfigurationFactory *factory
-            = ExtensionSystem::PluginManager::instance()->getObject<CMakeBuildConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObject<CMakeBuildConfigurationFactory>();
     CMakeBuildConfiguration *bc = factory->create(t, Constants::CMAKE_BC_ID, QLatin1String("all"));
     if (!bc)
         return false;
 
     t->addBuildConfiguration(bc);
 
-    DeployConfigurationFactory *fac = ExtensionSystem::PluginManager::instance()->getObject<DeployConfigurationFactory>();
+    DeployConfigurationFactory *fac = ExtensionSystem::PluginManager::getObject<DeployConfigurationFactory>();
     ProjectExplorer::DeployConfiguration *dc = fac->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
     t->addDeployConfiguration(dc);
     return true;
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index a765f524a7..9c8c41d807 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -303,7 +303,7 @@ IBuildConfigurationFactory::~IBuildConfigurationFactory()
 IBuildConfigurationFactory *IBuildConfigurationFactory::find(Target *parent, const QVariantMap &map)
 {
     QList<IBuildConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IBuildConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IBuildConfigurationFactory>();
     foreach (IBuildConfigurationFactory *factory, factories) {
         if (factory->canRestore(parent, map))
             return factory;
@@ -315,7 +315,7 @@ IBuildConfigurationFactory *IBuildConfigurationFactory::find(Target *parent, con
 IBuildConfigurationFactory * IBuildConfigurationFactory::find(Target *parent)
 {
     QList<IBuildConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IBuildConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IBuildConfigurationFactory>();
     foreach (IBuildConfigurationFactory *factory, factories) {
         if (!factory->availableCreationIds(parent).isEmpty())
             return factory;
@@ -327,7 +327,7 @@ IBuildConfigurationFactory * IBuildConfigurationFactory::find(Target *parent)
 IBuildConfigurationFactory *IBuildConfigurationFactory::find(Target *parent, BuildConfiguration *bc)
 {
     QList<IBuildConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IBuildConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IBuildConfigurationFactory>();
     foreach (IBuildConfigurationFactory *factory, factories) {
         if (factory->canClone(parent, bc))
             return factory;
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index cdd7c32528..3ff7312418 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -232,7 +232,7 @@ DeployConfiguration *DeployConfigurationFactory::clone(Target *parent, DeployCon
 DeployConfigurationFactory *DeployConfigurationFactory::find(Target *parent, const QVariantMap &map)
 {
     QList<DeployConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<DeployConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
     foreach (DeployConfigurationFactory *factory, factories) {
         if (factory->canRestore(parent, map))
             return factory;
@@ -244,7 +244,7 @@ QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *par
 {
     QList<DeployConfigurationFactory *> result;
     QList<DeployConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<DeployConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
     foreach (DeployConfigurationFactory *factory, factories) {
         if (!factory->availableCreationIds(parent).isEmpty())
             result << factory;
@@ -255,7 +255,7 @@ QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *par
 DeployConfigurationFactory *DeployConfigurationFactory::find(Target *parent, DeployConfiguration *dc)
 {
     QList<DeployConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<DeployConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
     foreach (DeployConfigurationFactory *factory, factories) {
         if (factory->canClone(parent, dc))
             return factory;
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 21d066d1c3..bbd4249289 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -328,7 +328,7 @@ KitInformation::ItemList DeviceTypeKitInformation::toUserOutput(const Kit *k) co
     QString typeDisplayName = tr("Unknown device type");
     if (type.isValid()) {
         QList<IDeviceFactory *> factories
-                = ExtensionSystem::PluginManager::instance()->getObjects<IDeviceFactory>();
+                = ExtensionSystem::PluginManager::getObjects<IDeviceFactory>();
         foreach (IDeviceFactory *factory, factories) {
             if (factory->availableCreationIds().contains(type)) {
                 typeDisplayName = factory->displayNameForId(type);
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
index 1cef6d3054..baf9f71fa6 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
@@ -248,7 +248,7 @@ DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Kit *workin
     KitConfigWidget(workingCopy, sticky), m_isReadOnly(false), m_comboBox(new QComboBox)
 {
     QList<IDeviceFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IDeviceFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IDeviceFactory>();
     foreach (IDeviceFactory *factory, factories) {
         foreach (Core::Id id, factory->availableCreationIds())
             m_comboBox->addItem(factory->displayNameForId(id), id.uniqueIdentifier());
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 5cb6620643..4a07959841 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -340,7 +340,7 @@ RunConfiguration *IRunConfigurationFactory::restore(Target *parent, const QVaria
 IRunConfigurationFactory *IRunConfigurationFactory::find(Target *parent, const QVariantMap &map)
 {
     QList<IRunConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IRunConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IRunConfigurationFactory>();
     foreach (IRunConfigurationFactory *factory, factories) {
         if (factory->canRestore(parent, map))
             return factory;
@@ -351,7 +351,7 @@ IRunConfigurationFactory *IRunConfigurationFactory::find(Target *parent, const Q
 IRunConfigurationFactory *IRunConfigurationFactory::find(Target *parent, RunConfiguration *rc)
 {
     QList<IRunConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IRunConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IRunConfigurationFactory>();
     foreach (IRunConfigurationFactory *factory, factories) {
         if (factory->canClone(parent, rc))
             return factory;
@@ -362,7 +362,7 @@ IRunConfigurationFactory *IRunConfigurationFactory::find(Target *parent, RunConf
 QList<IRunConfigurationFactory *> IRunConfigurationFactory::find(Target *parent)
 {
     QList<IRunConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<IRunConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<IRunConfigurationFactory>();
     QList<IRunConfigurationFactory *> result;
     foreach (IRunConfigurationFactory *factory, factories) {
         if (!factory->availableCreationIds(parent).isEmpty())
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp
index 01ef269347..7d346c070a 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp
@@ -41,7 +41,7 @@ ProFileHighlighter::ProFileHighlighter(QTextDocument *document) :
     TextEditor::SyntaxHighlighter(document)
 {
     ProFileCompletionAssistProvider *pcap
-            = ExtensionSystem::PluginManager::instance()->getObject<ProFileCompletionAssistProvider>();
+            = ExtensionSystem::PluginManager::getObject<ProFileCompletionAssistProvider>();
     m_keywords = TextEditor::Keywords(pcap->variables(), pcap->functions(), QMap<QString, QStringList>());
 }
 
diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
index 1d900c3153..3210c1ccbc 100644
--- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp
+++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
@@ -47,7 +47,7 @@ ProFileHoverHandler::ProFileHoverHandler(QObject *parent)
     m_manualKind(UnknownManual)
 {
     ProFileCompletionAssistProvider *pcap
-            = ExtensionSystem::PluginManager::instance()->getObject<ProFileCompletionAssistProvider>();
+            = ExtensionSystem::PluginManager::getObject<ProFileCompletionAssistProvider>();
     m_keywords = TextEditor::Keywords(pcap->variables(), pcap->functions(), QMap<QString, QStringList>());
 }
 
diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
index 7a578cf1ed..73abdded5e 100644
--- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
+++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
@@ -43,7 +43,7 @@ QmakeRunConfigurationFactory *QmakeRunConfigurationFactory::find(ProjectExplorer
         return 0;
 
     QList<QmakeRunConfigurationFactory *> factories
-            = ExtensionSystem::PluginManager::instance()->getObjects<QmakeRunConfigurationFactory>();
+            = ExtensionSystem::PluginManager::getObjects<QmakeRunConfigurationFactory>();
     foreach (QmakeRunConfigurationFactory *factory, factories) {
         if (factory->canHandle(t))
             return factory;
diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
index 638276b9c3..b254fac4d5 100644
--- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
@@ -222,7 +222,7 @@ void Qt4TargetSetupWidget::targetCheckBoxToggled(bool b)
 void Qt4TargetSetupWidget::manageKit()
 {
     ProjectExplorer::KitOptionsPage *page =
-            ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::KitOptionsPage>();
+            ExtensionSystem::PluginManager::getObject<ProjectExplorer::KitOptionsPage>();
     if (!page || !m_kit)
         return;
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 8e5b1ddfa9..c9f26bbc08 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -167,8 +167,7 @@ WelcomeMode::WelcomeMode() :
     scrollArea->setWidgetResizable(true);
     m_welcomePage->setMinimumWidth(880);
     m_welcomePage->setMinimumHeight(548);
-    PluginManager *pluginManager = PluginManager::instance();
-    connect(pluginManager, SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));
+    connect(PluginManager::instance(), SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));
 
     setWidget(m_modeWidget);
 }
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
index 7e53f1d6d4..2e2b36ff95 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
@@ -50,7 +50,7 @@ bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorStri
 
     bool found2 = false;
     bool found3 = false;
-    foreach (QObject *object, ExtensionSystem::PluginManager::instance()->allObjects()) {
+    foreach (QObject *object, ExtensionSystem::PluginManager::allObjects()) {
         if (object->objectName() == QLatin1String("MyPlugin2"))
             found2 = true;
         else if (object->objectName() == QLatin1String("MyPlugin3"))
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp
index e757e13e43..b80a85f942 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp
@@ -49,7 +49,7 @@ bool MyPlugin3::initialize(const QStringList & /*arguments*/, QString *errorStri
     addAutoReleasedObject(obj);
 
     bool found2 = false;
-    foreach (QObject *object, ExtensionSystem::PluginManager::instance()->allObjects()) {
+    foreach (QObject *object, ExtensionSystem::PluginManager::allObjects()) {
         if (object->objectName() == QLatin1String("MyPlugin2"))
             found2 = true;
     }