diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index fb5ac9c3ae705a86274bf9d35c28c2758fc4defb..f5e131b98b1cb69a3811b648dd99929b2b0f0f73 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 3d105e377e37c6733cc994cfd9177525f1050d30..b947b12aef29b13306ac7dbc61987098ecf44148 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -132,8 +132,6 @@ private: QWidget *m_buttonsWidget; QMap m_buttons; QMap m_actions; - - static OutputPaneManager *m_instance; }; } // namespace Internal diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index 29ea470411cb43da070515c8c2ebd090f9f88de0..3bd7dc2a03af8bba4f341816636bcab5832d5746 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 ace03bb3c17c393893623463fc4d5f02ae5cf3ab..808490d94c181662009370b82b41422525cfc9c4 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();