feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: More direct update of runconfiguration data

Browse Source 
The signal is not needed.

Change-Id: I6dd059fee64438da65cc9a32d42ab0e451763c86
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
hjk
2014-12-12 16:41:29 +01:00
parent c046898d94
commit 56a5ac367b
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerrunconfigurationaspect.cpp
View File

@@ -234,13 +234,13 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(
void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value) void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value)
{ {
m_useQmlDebugger = value ? EnabledLanguage : DisabledLanguage; m_useQmlDebugger = value ? EnabledLanguage : DisabledLanguage;
emit requestRunActionsUpdate(); runConfiguration()->requestRunActionsUpdate();
} }
void DebuggerRunConfigurationAspect::setUseCppDebugger(bool value) void DebuggerRunConfigurationAspect::setUseCppDebugger(bool value)
{ {
m_useCppDebugger = value ? EnabledLanguage : DisabledLanguage; m_useCppDebugger = value ? EnabledLanguage : DisabledLanguage;
emit requestRunActionsUpdate(); runConfiguration()->requestRunActionsUpdate();
} }
bool DebuggerRunConfigurationAspect::useCppDebugger() const bool DebuggerRunConfigurationAspect::useCppDebugger() const

9
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -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_projectSettings = 0;
m_globalSettings = 0; m_globalSettings = 0;
m_useGlobalSettings = false; m_useGlobalSettings = false;
connect(this, SIGNAL(requestRunActionsUpdate()), parent, SIGNAL(requestRunActionsUpdate()));
} }
IRunConfigurationAspect::~IRunConfigurationAspect() IRunConfigurationAspect::~IRunConfigurationAspect()
@@ -171,9 +170,9 @@ void IRunConfigurationAspect::toMap(QVariantMap &map) const
map.insert(m_id.toString() + QLatin1String(".UseGlobalSettings"), m_useGlobalSettings); 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) if (m_projectSettings)
other->m_projectSettings = m_projectSettings->clone(); other->m_projectSettings = m_projectSettings->clone();
other->m_globalSettings = m_globalSettings; other->m_globalSettings = m_globalSettings;

9
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -113,11 +113,11 @@ class PROJECTEXPLORER_EXPORT IRunConfigurationAspect : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit IRunConfigurationAspect(RunConfiguration *parent); explicit IRunConfigurationAspect(RunConfiguration *runConfig);
~IRunConfigurationAspect(); ~IRunConfigurationAspect();
virtual IRunConfigurationAspect *create(RunConfiguration *parent) const = 0; virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0;
virtual IRunConfigurationAspect *clone(RunConfiguration *parent) const; virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const;
virtual RunConfigWidget *createConfigurationWidget(); virtual RunConfigWidget *createConfigurationWidget();
void setId(Core::Id id) { m_id = id; } void setId(Core::Id id) { m_id = id; }
@@ -136,9 +136,6 @@ public:
ISettingsAspect *currentSettings() const; ISettingsAspect *currentSettings() const;
RunConfiguration *runConfiguration() const { return m_runConfiguration; } RunConfiguration *runConfiguration() const { return m_runConfiguration; }
signals:
void requestRunActionsUpdate();
protected: protected:
friend class RunConfiguration; friend class RunConfiguration;
virtual void fromMap(const QVariantMap &map); virtual void fromMap(const QVariantMap &map);