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

ProjectExplorer: Rename RunControl::finished to stopped

Browse Source 
That's what it is.

Change-Id: I8cf9af23bb7cafe1cde8f165fdbf85cdeb79f7e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-07-11 17:25:33 +02:00
parent 9e67a9453a
commit 0a2032e434
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/testrunner.cpp
View File

@@ -374,13 +374,13 @@ void TestRunner::debugTests()
processOutput(outputreader, msg, format); processOutput(outputreader, msg, format);
}); });
connect(runControl, &ProjectExplorer::RunControl::finished, connect(runControl, &ProjectExplorer::RunControl::stopped,
outputreader, &QObject::deleteLater); outputreader, &QObject::deleteLater);
} }
connect(this, &TestRunner::requestStopTestRun, runControl, connect(this, &TestRunner::requestStopTestRun, runControl,
&ProjectExplorer::RunControl::initiateStop); &ProjectExplorer::RunControl::initiateStop);
connect(runControl, &ProjectExplorer::RunControl::finished, this, &TestRunner::onFinished); connect(runControl, &ProjectExplorer::RunControl::stopped, this, &TestRunner::onFinished);
ProjectExplorer::ProjectExplorerPlugin::startRunControl(runControl); ProjectExplorer::ProjectExplorerPlugin::startRunControl(runControl);
} }

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2081,7 +2081,7 @@ void DebuggerPluginPrivate::attachToUnstartedApplicationDialog()
return; return;
if (dlg->hideOnAttach()) if (dlg->hideOnAttach())
connect(rc, &RunControl::finished, dlg, &UnstartedAppWatcherDialog::startWatching); connect(rc, &RunControl::stopped, dlg, &UnstartedAppWatcherDialog::startWatching);
}); });
dlg->show(); dlg->show();

2
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -406,7 +406,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
this, &AppOutputPane::slotRunControlChanged); this, &AppOutputPane::slotRunControlChanged);
connect(rc, &RunControl::started, connect(rc, &RunControl::started,
this, &AppOutputPane::slotRunControlChanged); this, &AppOutputPane::slotRunControlChanged);
connect(rc, &RunControl::finished, connect(rc, &RunControl::stopped,
this, &AppOutputPane::slotRunControlFinished); this, &AppOutputPane::slotRunControlFinished);
connect(rc, &RunControl::applicationProcessHandleChanged, connect(rc, &RunControl::applicationProcessHandleChanged,
this, &AppOutputPane::enableDefaultButtons); this, &AppOutputPane::enableDefaultButtons);

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

@@ -1216,7 +1216,7 @@ void RunControlPrivate::setState(RunControlState newState)
foreach (auto worker, m_workers) foreach (auto worker, m_workers)
if (worker) if (worker)
worker->onFinished(); worker->onFinished();
emit q->finished(); emit q->stopped();
break; break;
default: default:
break; break;

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

@@ -478,7 +478,7 @@ signals:
const QString &msg, Utils::OutputFormat format); const QString &msg, Utils::OutputFormat format);
void aboutToStart(); void aboutToStart();
void started(); void started();
void finished(); void stopped();
void applicationProcessHandleChanged(QPrivateSignal); // Use setApplicationProcessHandle void applicationProcessHandleChanged(QPrivateSignal); // Use setApplicationProcessHandle
private: private:

2
src/plugins/projectexplorer/waitforstopdialog.cpp
View File

@@ -55,7 +55,7 @@ WaitForStopDialog::WaitForStopDialog(QList<ProjectExplorer::RunControl *> runCon
updateProgressText(); updateProgressText();
foreach (RunControl *rc, runControls) foreach (RunControl *rc, runControls)
connect(rc, &RunControl::finished, this, &WaitForStopDialog::runControlFinished); connect(rc, &RunControl::stopped, this, &WaitForStopDialog::runControlFinished);
m_timer.start(); m_timer.start();
} }

2
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -339,7 +339,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
} }
} }
connect(runControl, &RunControl::finished, this, [this, runControl] { connect(runControl, &RunControl::stopped, this, [this, runControl] {
d->m_toolBusy = false; d->m_toolBusy = false;
updateRunActions(); updateRunActions();
disconnect(d->m_stopAction, &QAction::triggered, runControl, &RunControl::initiateStop); disconnect(d->m_stopAction, &QAction::triggered, runControl, &RunControl::initiateStop);

2
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -741,7 +741,7 @@ ValgrindToolRunner *CallgrindTool::createRunTool(RunControl *runControl)
auto toolRunner = new CallgrindToolRunner(runControl); auto toolRunner = new CallgrindToolRunner(runControl);
connect(toolRunner, &CallgrindToolRunner::parserDataReady, this, &CallgrindTool::takeParserDataFromRunControl); connect(toolRunner, &CallgrindToolRunner::parserDataReady, this, &CallgrindTool::takeParserDataFromRunControl);
connect(runControl, &RunControl::finished, this, &CallgrindTool::engineFinished); connect(runControl, &RunControl::stopped, this, &CallgrindTool::engineFinished);
connect(this, &CallgrindTool::dumpRequested, toolRunner, &CallgrindToolRunner::dump); connect(this, &CallgrindTool::dumpRequested, toolRunner, &CallgrindToolRunner::dump);
connect(this, &CallgrindTool::resetRequested, toolRunner, &CallgrindToolRunner::reset); connect(this, &CallgrindTool::resetRequested, toolRunner, &CallgrindToolRunner::reset);

2
src/plugins/valgrind/memcheckengine.cpp
View File

@@ -174,7 +174,7 @@ void MemcheckToolRunner::startDebugger(qint64 valgrindPid)
auto gdbWorker = new Debugger::DebuggerRunTool(runControl()); auto gdbWorker = new Debugger::DebuggerRunTool(runControl());
gdbWorker->setStartParameters(sp); gdbWorker->setStartParameters(sp);
gdbWorker->initiateStart(); gdbWorker->initiateStart();
connect(runControl(), &RunControl::finished, gdbWorker, &RunControl::deleteLater); connect(runControl(), &RunControl::stopped, gdbWorker, &RunControl::deleteLater);
} }
void MemcheckToolRunner::appendLog(const QByteArray &data) void MemcheckToolRunner::appendLog(const QByteArray &data)