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

ProjectExplorer: Unify RunControl setup/teardown

Browse Source 
Provide protected methods in RunControl to handle the notification
of when the RunControl starts and stops. Use these helpers to
move the isRunning() method into the RunConfiguration itself instead
of reimplementing it everywhere.

Change-Id: Ia8de42f7a6a14a049870d4e7fcb9af6756c2caa4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-27 17:25:58 +01:00
parent 329db5f4cc
commit e07c6383d7
22 changed files with 78 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -112,8 +112,7 @@ DebuggerRunControl *createHelper(RunConfiguration *runConfig, Internal::Debugger
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngine *engine)
: RunControl(runConfig, DebugRunMode),
m_engine(engine),
m_running(false)
m_engine(engine)
{
setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR);
connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished);
@@ -192,8 +191,8 @@ void DebuggerRunControl::start()
&& m_engine->runParameters().inferior.executable.isEmpty()
&& m_engine->runParameters().interpreter.isEmpty()) {
appendMessage(tr("No executable specified.") + QLatin1Char('\n'), ErrorMessageFormat);
emit started();
emit finished();
reportApplicationStart();
reportApplicationStop();
return;
}
@@ -226,20 +225,18 @@ void DebuggerRunControl::start()
// We might get a synchronous startFailed() notification on Windows,
// when launching the process fails. Emit a proper finished() sequence.
emit started();
m_running = true;
reportApplicationStart();
m_engine->startDebugger(this);
if (m_running)
if (isRunning())
appendMessage(tr("Debugging starts") + QLatin1Char('\n'), NormalMessageFormat);
}
void DebuggerRunControl::startFailed()
{
appendMessage(tr("Debugging has failed") + QLatin1Char('\n'), NormalMessageFormat);
m_running = false;
emit finished();
reportApplicationStop();
m_engine->handleStartFailed();
}
@@ -288,8 +285,7 @@ RunControl::StopResult DebuggerRunControl::stop()
void DebuggerRunControl::debuggingFinished()
{
m_running = false;
emit finished();
reportApplicationStop();
}
void DebuggerRunControl::showMessage(const QString &msg, int channel)
@@ -297,11 +293,6 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel)
m_engine->showMessage(msg, channel);
}
bool DebuggerRunControl::isRunning() const
{
return m_running;
}
DebuggerStartParameters &DebuggerRunControl::startParameters()
{
return m_engine->runParameters();