From 8f921b954ddb60f8fad3d24b61ff3ee7ec53b792 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 21 Apr 2011 13:43:38 +0200
Subject: [PATCH] Maemo: Remove outdated code.

This was left over from the time where there was only one kind
Target class for all Maemo-like target types.
---
 .../qt-maemo/maemorunconfigurationwidget.cpp  | 44 +++++--------------
 .../qt-maemo/maemorunconfigurationwidget.h    |  3 --
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index 869062064e1..2a2a213d851 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -80,7 +80,6 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
     m_deviceEnvReader(new MaemoDeviceEnvReader(this, runConfiguration)),
     m_deployablesConnected(false)
 {
-    m_lastActiveBuildConfig = m_runConfiguration->activeQt4BuildConfiguration();
     QVBoxLayout *mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     addGenericWidgets(mainLayout);
@@ -92,14 +91,20 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
         SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
         this, SLOT(handleCurrentDeviceConfigChanged()));
     handleCurrentDeviceConfigChanged();
-    connect(m_runConfiguration->maemoTarget(),
-        SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
-        this, SLOT(handleBuildConfigChanged()));
 
     connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
             this, SLOT(runConfigurationEnabledChange(bool)));
 
-    handleBuildConfigChanged();
+    const AbstractQt4MaemoTarget * const maemoTarget
+        = runConfiguration->maemoTarget();
+    const bool remoteMountsAvailable = maemoTarget->allowsRemoteMounts();
+    m_debugDetailsContainer->setVisible(remoteMountsAvailable);
+    m_mountDetailsContainer->setVisible(remoteMountsAvailable);
+    const bool qmlDebuggingAvailable = maemoTarget->allowsQmlDebugging();
+    m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
+    m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
+    m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
+    m_debugCppAndQmlButton->setVisible(qmlDebuggingAvailable);
 
     setEnabled(m_runConfiguration->isEnabled());
 }
@@ -327,35 +332,6 @@ void MaemoRunConfigurationWidget::handleDeploySpecsChanged()
     m_runConfiguration->updateFactoryState();
 }
 
-void MaemoRunConfigurationWidget::handleBuildConfigChanged()
-{
-    if (m_lastActiveBuildConfig)
-        disconnect(m_lastActiveBuildConfig, 0, this, 0);
-    m_lastActiveBuildConfig = m_runConfiguration->activeQt4BuildConfiguration();
-    if (m_lastActiveBuildConfig) {
-        connect(m_lastActiveBuildConfig, SIGNAL(qtVersionChanged()), this,
-            SLOT(handleToolchainChanged()));
-    }
-    handleToolchainChanged();
-}
-
-void MaemoRunConfigurationWidget::handleToolchainChanged()
-{
-    const AbstractQt4MaemoTarget * const maemoTarget
-        = m_runConfiguration->maemoTarget();
-    if (maemoTarget) {
-        const bool remoteMountsAvailable = maemoTarget->allowsRemoteMounts();
-        m_debugDetailsContainer->setVisible(remoteMountsAvailable);
-        m_mountDetailsContainer->setVisible(remoteMountsAvailable);
-        const bool qmlDebuggingAvailable = maemoTarget->allowsQmlDebugging();
-        m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
-        m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
-        m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
-        m_debugCppAndQmlButton->setVisible(qmlDebuggingAvailable);
-    }
-    m_runConfiguration->updateFactoryState();
-}
-
 void MaemoRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link)
 {
     if (link == QLatin1String("deviceconfig")) {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
index a61a573d146..0c1832ae7cb 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
@@ -93,8 +93,6 @@ private slots:
     void handleRemoteMountsChanged();
     void handleDebuggingTypeChanged();
     void handleDeploySpecsChanged();
-    void handleBuildConfigChanged();
-    void handleToolchainChanged();
     void handleActiveDeployConfigurationChanged();
 
 private:
@@ -124,7 +122,6 @@ private:
     QComboBox *m_baseEnvironmentComboBox;
     MaemoDeviceEnvReader *m_deviceEnvReader;
     ProjectExplorer::EnvironmentWidget *m_environmentWidget;
-    Qt4BuildConfiguration *m_lastActiveBuildConfig;
     bool m_deployablesConnected;
 };