Remove DeployConfigurationWidget::init()

It serves no purpose.

Change-Id: Ic9d802aa2b46aae567c5a84d199d37564c69f7ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

9 files changed, 24 insertions, 36 deletions

diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp
index 0f07c706d5..9e7c2ef646 100644
--- a/src/plugins/madde/qt4maemodeployconfiguration.cpp
+++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp
@@ -80,7 +80,7 @@ Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target
 
 DeployConfigurationWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
 {
-    return new RemoteLinuxDeployConfigurationWidget;
+    return new RemoteLinuxDeployConfigurationWidget(this);
 }
 
 Qt4MaemoDeployConfiguration::~Qt4MaemoDeployConfiguration() {}
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index b0398254d6..ec57162919 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -130,9 +130,6 @@ class PROJECTEXPLORER_EXPORT DeployConfigurationWidget : public NamedWidget
 
 public:
     explicit DeployConfigurationWidget(QWidget *parent = 0);
-
-    // This is called to set up the config widget before showing it
-    virtual void init(DeployConfiguration *dc) = 0;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 524c5b21cb..bf19e13c59 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -497,10 +497,8 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
     m_ignoreChange = false;
 
     m_deployConfigurationWidget = dc->createConfigWidget();
-    if (m_deployConfigurationWidget) {
-        m_deployConfigurationWidget->init(dc);
+    if (m_deployConfigurationWidget)
         m_deployLayout->addWidget(m_deployConfigurationWidget);
-    }
 
     m_deploySteps = new BuildStepListWidget;
     m_deploySteps->init(dc->stepList());
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index 5c3de649fe..ef16e6a6ad 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -161,5 +161,5 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
 
 ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget()
 {
-    return new BlackBerryDeployConfigurationWidget;
+    return new BlackBerryDeployConfigurationWidget(this);
 }
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
index 38b4172a07..8cfb92b63d 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
@@ -43,22 +43,14 @@
 using namespace Qnx;
 using namespace Qnx::Internal;
 
-BlackBerryDeployConfigurationWidget::BlackBerryDeployConfigurationWidget(QWidget *parent)
+BlackBerryDeployConfigurationWidget::BlackBerryDeployConfigurationWidget(BlackBerryDeployConfiguration *dc,
+                                                                         QWidget *parent)
     : ProjectExplorer::DeployConfigurationWidget(parent)
     , m_ui(new Ui::BlackBerryDeployConfigurationWidget)
     , m_deployConfiguration(0)
 {
     m_ui->setupUi(this);
-}
-
-BlackBerryDeployConfigurationWidget::~BlackBerryDeployConfigurationWidget()
-{
-    delete m_ui;
-}
-
-void BlackBerryDeployConfigurationWidget::init(ProjectExplorer::DeployConfiguration *dc)
-{
-    m_deployConfiguration = qobject_cast<BlackBerryDeployConfiguration *>(dc);
+    m_deployConfiguration = dc;
 
     m_ui->deployPackagesView->setModel(m_deployConfiguration->deploymentInfo());
 
@@ -75,3 +67,8 @@ void BlackBerryDeployConfigurationWidget::init(ProjectExplorer::DeployConfigurat
 
     m_ui->deployPackagesView->header()->resizeSections(QHeaderView::ResizeToContents);
 }
+
+BlackBerryDeployConfigurationWidget::~BlackBerryDeployConfigurationWidget()
+{
+    delete m_ui;
+}
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
index d2451f64bb..294d43ab2e 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
@@ -47,11 +47,9 @@ class BlackBerryDeployConfigurationWidget : public ProjectExplorer::DeployConfig
 {
     Q_OBJECT
 public:
-    explicit BlackBerryDeployConfigurationWidget(QWidget *parent = 0);
+    explicit BlackBerryDeployConfigurationWidget(BlackBerryDeployConfiguration *dc, QWidget *parent = 0);
     ~BlackBerryDeployConfigurationWidget();
 
-    void init(ProjectExplorer::DeployConfiguration *dc);
-
 private:
     Ui::BlackBerryDeployConfigurationWidget *m_ui;
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 2bbc59a180..4fefd16139 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -53,7 +53,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
 
 DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
 {
-    return new RemoteLinuxDeployConfigurationWidget;
+    return new RemoteLinuxDeployConfigurationWidget(this);
 }
 
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
index fb1169f142..9a0efb915c 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
@@ -53,7 +53,8 @@ public:
 
 using namespace Internal;
 
-RemoteLinuxDeployConfigurationWidget::RemoteLinuxDeployConfigurationWidget(QWidget *parent) :
+RemoteLinuxDeployConfigurationWidget::RemoteLinuxDeployConfigurationWidget(RemoteLinuxDeployConfiguration *dc,
+                                                                           QWidget *parent) :
     DeployConfigurationWidget(parent), d(new RemoteLinuxDeployConfigurationWidgetPrivate)
 {
     d->ui.setupUi(this);
@@ -61,6 +62,11 @@ RemoteLinuxDeployConfigurationWidget::RemoteLinuxDeployConfigurationWidget(QWidg
     d->ui.deploymentDataView->setWordWrap(false);
     d->ui.deploymentDataView->setUniformRowHeights(true);
     d->ui.deploymentDataView->setModel(&d->deploymentDataModel);
+
+    d->deployConfiguration = dc;
+
+    connect(dc->target(), SIGNAL(deploymentDataChanged()), SLOT(updateDeploymentDataModel()));
+    updateDeploymentDataModel();
 }
 
 RemoteLinuxDeployConfigurationWidget::~RemoteLinuxDeployConfigurationWidget()
@@ -68,15 +74,6 @@ RemoteLinuxDeployConfigurationWidget::~RemoteLinuxDeployConfigurationWidget()
     delete d;
 }
 
-void RemoteLinuxDeployConfigurationWidget::init(DeployConfiguration *dc)
-{
-    d->deployConfiguration = qobject_cast<RemoteLinuxDeployConfiguration *>(dc);
-    QTC_ASSERT(d->deployConfiguration, return);
-
-    connect(dc->target(), SIGNAL(deploymentDataChanged()), SLOT(updateDeploymentDataModel()));
-    updateDeploymentDataModel();
-}
-
 void RemoteLinuxDeployConfigurationWidget::updateDeploymentDataModel()
 {
     d->deploymentDataModel.setDeploymentData(d->deployConfiguration->target()->deploymentData());
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index 0c032862ce..fa9a737959 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -34,6 +34,8 @@
 #include <projectexplorer/deployconfiguration.h>
 
 namespace RemoteLinux {
+class RemoteLinuxDeployConfiguration;
+
 namespace Internal {
 class RemoteLinuxDeployConfigurationWidgetPrivate;
 } // namespace Internal
@@ -44,11 +46,10 @@ class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget
     Q_OBJECT
 
 public:
-    explicit RemoteLinuxDeployConfigurationWidget(QWidget *parent = 0);
+    explicit RemoteLinuxDeployConfigurationWidget(RemoteLinux::RemoteLinuxDeployConfiguration *dc,
+                                                  QWidget *parent = 0);
     ~RemoteLinuxDeployConfigurationWidget();
 
-    void init(ProjectExplorer::DeployConfiguration *dc);
-
 private slots:
     void updateDeploymentDataModel();