diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp index f5ee645915a..37983351f9a 100644 --- a/src/libs/extensionsystem/pluginerroroverview.cpp +++ b/src/libs/extensionsystem/pluginerroroverview.cpp @@ -35,43 +35,12 @@ Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*) namespace ExtensionSystem { -namespace Internal { - -class PluginErrorOverviewPrivate : public QObject -{ - Q_OBJECT -public: - PluginErrorOverviewPrivate(QDialog *dialog); - ~PluginErrorOverviewPrivate(); - -private slots: - void showDetails(QListWidgetItem *item); - -private: - Ui::PluginErrorOverview *m_ui; -}; - -} // Internal -} // ExtensionSystem - -using namespace ExtensionSystem; -using namespace ExtensionSystem::Internal; PluginErrorOverview::PluginErrorOverview(QWidget *parent) : QDialog(parent), - d(new PluginErrorOverviewPrivate(this)) + m_ui(new Internal::Ui::PluginErrorOverview) { -} - -PluginErrorOverview::~PluginErrorOverview() -{ - delete d; -} - -PluginErrorOverviewPrivate::PluginErrorOverviewPrivate(QDialog *dialog) - : m_ui(new Ui::PluginErrorOverview) -{ - m_ui->setupUi(dialog); + m_ui->setupUi(this); m_ui->buttonBox->addButton(tr("Continue"), QDialogButtonBox::AcceptRole); foreach (PluginSpec *spec, PluginManager::plugins()) { @@ -90,12 +59,12 @@ PluginErrorOverviewPrivate::PluginErrorOverviewPrivate(QDialog *dialog) m_ui->pluginList->setCurrentRow(0); } -PluginErrorOverviewPrivate::~PluginErrorOverviewPrivate() +PluginErrorOverview::~PluginErrorOverview() { delete m_ui; } -void PluginErrorOverviewPrivate::showDetails(QListWidgetItem *item) +void PluginErrorOverview::showDetails(QListWidgetItem *item) { if (item) { PluginSpec *spec = item->data(Qt::UserRole).value(); @@ -105,4 +74,6 @@ void PluginErrorOverviewPrivate::showDetails(QListWidgetItem *item) } } +} // namespace ExtensionSystem + #include "pluginerroroverview.moc" diff --git a/src/libs/extensionsystem/pluginerroroverview.h b/src/libs/extensionsystem/pluginerroroverview.h index 8ec826aacea..08394ee5232 100644 --- a/src/libs/extensionsystem/pluginerroroverview.h +++ b/src/libs/extensionsystem/pluginerroroverview.h @@ -34,13 +34,15 @@ #include +QT_BEGIN_NAMESPACE +class QListWidgetItem; +QT_END_NAMESPACE + namespace ExtensionSystem { -class PluginManager; - namespace Internal { -class PluginErrorOverviewPrivate; -} +namespace Ui { class PluginErrorOverview; } +} // namespace Internal class EXTENSIONSYSTEM_EXPORT PluginErrorOverview : public QDialog { @@ -50,8 +52,11 @@ public: explicit PluginErrorOverview(QWidget *parent = 0); ~PluginErrorOverview(); +private slots: + void showDetails(QListWidgetItem *item); + private: - Internal::PluginErrorOverviewPrivate *d; + Internal::Ui::PluginErrorOverview *m_ui; }; } // ExtensionSystem