From 1a621a9c9e7507679d0d980583f60615c23b3b11 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 26 Jan 2009 14:30:04 +0100
Subject: [PATCH]     Fixes:    coreplugin: remove a few more PluginManager*
 parameters

---
 src/plugins/coreplugin/mainwindow.cpp   | 2 +-
 src/plugins/coreplugin/outputpane.h     | 2 --
 src/plugins/coreplugin/plugindialog.cpp | 4 ++--
 src/plugins/coreplugin/plugindialog.h   | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index fb5ac9c3ae7..f5e131b98b1 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -1114,7 +1114,7 @@ void MainWindow::destroyVersionDialog()
 
 void MainWindow::aboutPlugins()
 {
-    PluginDialog dialog(ExtensionSystem::PluginManager::instance(), this);
+    PluginDialog dialog(this);
     dialog.exec();
 }
 
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 3d105e377e3..b947b12aef2 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -132,8 +132,6 @@ private:
     QWidget *m_buttonsWidget;
     QMap<int, QPushButton *> m_buttons;
     QMap<QAction *, int> m_actions;
-
-    static OutputPaneManager *m_instance;
 };
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp
index 29ea470411c..3bd7dc2a03a 100644
--- a/src/plugins/coreplugin/plugindialog.cpp
+++ b/src/plugins/coreplugin/plugindialog.cpp
@@ -48,9 +48,9 @@
 
 using namespace Core::Internal;
 
-PluginDialog::PluginDialog(ExtensionSystem::PluginManager *manager, QWidget *parent)
+PluginDialog::PluginDialog(QWidget *parent)
     : QDialog(parent),
-      m_view(new ExtensionSystem::PluginView(manager, this))
+      m_view(new ExtensionSystem::PluginView(ExtensionSystem::PluginManager::instance(), this))
 {
     QVBoxLayout *vl = new QVBoxLayout(this);
     vl->addWidget(m_view);
diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h
index ace03bb3c17..808490d94c1 100644
--- a/src/plugins/coreplugin/plugindialog.h
+++ b/src/plugins/coreplugin/plugindialog.h
@@ -41,7 +41,6 @@ class QPushButton;
 QT_END_NAMESPACE
 
 namespace ExtensionSystem {
-class PluginManager;
 class PluginSpec;
 class PluginView;
 }
@@ -54,7 +53,7 @@ class PluginDialog : public QDialog
     Q_OBJECT
 
 public:
-    PluginDialog(ExtensionSystem::PluginManager *manager, QWidget *parent);
+    explicit PluginDialog(QWidget *parent);
 
 private slots:
     void updateButtons();