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

runconfiguration: interface cleanup

Browse Source 
Change-Id: I8a6fe6598d3d167a20c17e7f695fb6eff3fa0874
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
hjk
2012-02-23 12:28:28 +01:00
committed by hjk
parent 742019e301
commit fbeeac5672
5 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,13 +205,13 @@ void DebuggerMainWindowPrivate::updateUiForTarget(Target *target)
void DebuggerMainWindowPrivate::updateUiForRunConfiguration(RunConfiguration *rc) void DebuggerMainWindowPrivate::updateUiForRunConfiguration(RunConfiguration *rc)
{ {
if (m_previousRunConfiguration) if (m_previousRunConfiguration)
disconnect(m_previousRunConfiguration, SIGNAL(debuggersChanged()), disconnect(m_previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
this, SLOT(updateUiForCurrentRunConfiguration())); this, SLOT(updateUiForCurrentRunConfiguration()));
m_previousRunConfiguration = rc; m_previousRunConfiguration = rc;
updateUiForCurrentRunConfiguration(); updateUiForCurrentRunConfiguration();
if (!rc) if (!rc)
return; return;
connect(m_previousRunConfiguration, connect(m_previousRunConfiguration->debuggerAspect(),
SIGNAL(debuggersChanged()), SIGNAL(debuggersChanged()),
SLOT(updateUiForCurrentRunConfiguration())); SLOT(updateUiForCurrentRunConfiguration()));
} }

3
src/plugins/madde/maemorunconfigurationwidget.cpp
View File

@@ -85,7 +85,8 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
addMountWidgets(subLayout); addMountWidgets(subLayout);
connect(m_runConfiguration, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)), connect(m_runConfiguration, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
this, SLOT(updateMountWarning())); this, SLOT(updateMountWarning()));
connect(m_runConfiguration, SIGNAL(debuggersChanged()), SLOT(updateMountWarning())); connect(m_runConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
SLOT(updateMountWarning()));
updateMountWarning(); updateMountWarning();
const AbstractQt4MaemoTarget * const maemoTarget const AbstractQt4MaemoTarget * const maemoTarget

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -2198,14 +2198,14 @@ void ProjectExplorerPlugin::activeRunConfigurationChanged()
if (previousRunConfiguration) { if (previousRunConfiguration) {
disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)), disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)),
this, SIGNAL(updateRunActions())); this, SIGNAL(updateRunActions()));
disconnect(previousRunConfiguration, SIGNAL(debuggersChanged()), disconnect(previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
this, SIGNAL(updateRunActions())); this, SIGNAL(updateRunActions()));
} }
previousRunConfiguration = rc; previousRunConfiguration = rc;
if (rc) { if (rc) {
connect(rc, SIGNAL(isEnabledChanged(bool)), connect(rc, SIGNAL(isEnabledChanged(bool)),
this, SIGNAL(updateRunActions())); this, SIGNAL(updateRunActions()));
connect(rc, SIGNAL(debuggersChanged()), connect(rc->debuggerAspect(), SIGNAL(debuggersChanged()),
this, SIGNAL(updateRunActions())); this, SIGNAL(updateRunActions()));
} }
emit updateRunActions(); emit updateRunActions();

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

@@ -253,12 +253,6 @@ uint DebuggerProjectSettings::qmlDebugServerPort() const
return m_qmlDebugServerPort; return m_qmlDebugServerPort;
} }
void DebuggerProjectSettings::setQmlDebugServerPort(uint port)
{
m_qmlDebugServerPort = port;
emit qmlDebugServerPortChanged(port);
}
void DebuggerProjectSettings::suppressQmlDebuggingOptions() void DebuggerProjectSettings::suppressQmlDebuggingOptions()
{ {
m_suppressQmlDebuggingOptions = true; m_suppressQmlDebuggingOptions = true;

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

@@ -112,13 +112,11 @@ public:
bool useCppDebugger() const; bool useCppDebugger() const;
QmlDebuggerStatus useQmlDebugger() const; QmlDebuggerStatus useQmlDebugger() const;
uint qmlDebugServerPort() const; uint qmlDebugServerPort() const;
void setQmlDebugServerPort(uint port);
void suppressQmlDebuggingOptions(); void suppressQmlDebuggingOptions();
bool areQmlDebuggingOptionsSuppressed() const; bool areQmlDebuggingOptionsSuppressed() const;
signals: signals:
void debuggersChanged(); void debuggersChanged();
void qmlDebugServerPortChanged(uint port);
public: public:
bool m_useCppDebugger; bool m_useCppDebugger;
@@ -168,8 +166,6 @@ public:
signals: signals:
void isEnabledChanged(bool value); void isEnabledChanged(bool value);
void debuggersChanged();
void qmlDebugServerPortChanged(uint port);
protected: protected:
RunConfiguration(Target *parent, const QString &id); RunConfiguration(Target *parent, const QString &id);