From fbeeac5672ab5a568b32c15a9319674119fe047c Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 23 Feb 2012 12:28:28 +0100 Subject: [PATCH] runconfiguration: interface cleanup Change-Id: I8a6fe6598d3d167a20c17e7f695fb6eff3fa0874 Reviewed-by: Christian Kandeler --- src/plugins/debugger/debuggermainwindow.cpp | 4 ++-- src/plugins/madde/maemorunconfigurationwidget.cpp | 3 ++- src/plugins/projectexplorer/projectexplorer.cpp | 4 ++-- src/plugins/projectexplorer/runconfiguration.cpp | 6 ------ src/plugins/projectexplorer/runconfiguration.h | 4 ---- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index fb8517feb9a..d5c1102b9e0 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -205,13 +205,13 @@ void DebuggerMainWindowPrivate::updateUiForTarget(Target *target) void DebuggerMainWindowPrivate::updateUiForRunConfiguration(RunConfiguration *rc) { if (m_previousRunConfiguration) - disconnect(m_previousRunConfiguration, SIGNAL(debuggersChanged()), + disconnect(m_previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()), this, SLOT(updateUiForCurrentRunConfiguration())); m_previousRunConfiguration = rc; updateUiForCurrentRunConfiguration(); if (!rc) return; - connect(m_previousRunConfiguration, + connect(m_previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()), SLOT(updateUiForCurrentRunConfiguration())); } diff --git a/src/plugins/madde/maemorunconfigurationwidget.cpp b/src/plugins/madde/maemorunconfigurationwidget.cpp index 6e7548e26b2..95d238c8af5 100644 --- a/src/plugins/madde/maemorunconfigurationwidget.cpp +++ b/src/plugins/madde/maemorunconfigurationwidget.cpp @@ -85,7 +85,8 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( addMountWidgets(subLayout); connect(m_runConfiguration, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)), this, SLOT(updateMountWarning())); - connect(m_runConfiguration, SIGNAL(debuggersChanged()), SLOT(updateMountWarning())); + connect(m_runConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()), + SLOT(updateMountWarning())); updateMountWarning(); const AbstractQt4MaemoTarget * const maemoTarget diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index a3d52ba72c7..c9a908c0460 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2198,14 +2198,14 @@ void ProjectExplorerPlugin::activeRunConfigurationChanged() if (previousRunConfiguration) { disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)), this, SIGNAL(updateRunActions())); - disconnect(previousRunConfiguration, SIGNAL(debuggersChanged()), + disconnect(previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()), this, SIGNAL(updateRunActions())); } previousRunConfiguration = rc; if (rc) { connect(rc, SIGNAL(isEnabledChanged(bool)), this, SIGNAL(updateRunActions())); - connect(rc, SIGNAL(debuggersChanged()), + connect(rc->debuggerAspect(), SIGNAL(debuggersChanged()), this, SIGNAL(updateRunActions())); } emit updateRunActions(); diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 42bc90afa8b..a23357fe558 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -253,12 +253,6 @@ uint DebuggerProjectSettings::qmlDebugServerPort() const return m_qmlDebugServerPort; } -void DebuggerProjectSettings::setQmlDebugServerPort(uint port) -{ - m_qmlDebugServerPort = port; - emit qmlDebugServerPortChanged(port); -} - void DebuggerProjectSettings::suppressQmlDebuggingOptions() { m_suppressQmlDebuggingOptions = true; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index aafd5385bb9..cfbadbaba3e 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -112,13 +112,11 @@ public: bool useCppDebugger() const; QmlDebuggerStatus useQmlDebugger() const; uint qmlDebugServerPort() const; - void setQmlDebugServerPort(uint port); void suppressQmlDebuggingOptions(); bool areQmlDebuggingOptionsSuppressed() const; signals: void debuggersChanged(); - void qmlDebugServerPortChanged(uint port); public: bool m_useCppDebugger; @@ -168,8 +166,6 @@ public: signals: void isEnabledChanged(bool value); - void debuggersChanged(); - void qmlDebugServerPortChanged(uint port); protected: RunConfiguration(Target *parent, const QString &id);