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

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

5 files changed, 11 insertions, 11 deletions

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