diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 454b023b3a0..58572946dda 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -234,13 +234,13 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect( void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value) { m_useQmlDebugger = value ? EnabledLanguage : DisabledLanguage; - emit requestRunActionsUpdate(); + runConfiguration()->requestRunActionsUpdate(); } void DebuggerRunConfigurationAspect::setUseCppDebugger(bool value) { m_useCppDebugger = value ? EnabledLanguage : DisabledLanguage; - emit requestRunActionsUpdate(); + runConfiguration()->requestRunActionsUpdate(); } bool DebuggerRunConfigurationAspect::useCppDebugger() const diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 3429c483fea..5e6c73f3f99 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -115,13 +115,12 @@ ISettingsAspect *ISettingsAspect::clone() const // /////////////////////////////////////////////////////////////////////// -IRunConfigurationAspect::IRunConfigurationAspect(RunConfiguration *parent) +IRunConfigurationAspect::IRunConfigurationAspect(RunConfiguration *runConfig) { - m_runConfiguration = parent; + m_runConfiguration = runConfig; m_projectSettings = 0; m_globalSettings = 0; m_useGlobalSettings = false; - connect(this, SIGNAL(requestRunActionsUpdate()), parent, SIGNAL(requestRunActionsUpdate())); } IRunConfigurationAspect::~IRunConfigurationAspect() @@ -171,9 +170,9 @@ void IRunConfigurationAspect::toMap(QVariantMap &map) const map.insert(m_id.toString() + QLatin1String(".UseGlobalSettings"), m_useGlobalSettings); } -IRunConfigurationAspect *IRunConfigurationAspect::clone(RunConfiguration *parent) const +IRunConfigurationAspect *IRunConfigurationAspect::clone(RunConfiguration *runConfig) const { - IRunConfigurationAspect *other = create(parent); + IRunConfigurationAspect *other = create(runConfig); if (m_projectSettings) other->m_projectSettings = m_projectSettings->clone(); other->m_globalSettings = m_globalSettings; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index d52d4b4172c..47eacffa236 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -113,11 +113,11 @@ class PROJECTEXPLORER_EXPORT IRunConfigurationAspect : public QObject Q_OBJECT public: - explicit IRunConfigurationAspect(RunConfiguration *parent); + explicit IRunConfigurationAspect(RunConfiguration *runConfig); ~IRunConfigurationAspect(); - virtual IRunConfigurationAspect *create(RunConfiguration *parent) const = 0; - virtual IRunConfigurationAspect *clone(RunConfiguration *parent) const; + virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0; + virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const; virtual RunConfigWidget *createConfigurationWidget(); void setId(Core::Id id) { m_id = id; } @@ -136,9 +136,6 @@ public: ISettingsAspect *currentSettings() const; RunConfiguration *runConfiguration() const { return m_runConfiguration; } -signals: - void requestRunActionsUpdate(); - protected: friend class RunConfiguration; virtual void fromMap(const QVariantMap &map);