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

ProjectExplorer: Remove RunWorkerState::Failed

Browse Source 
It is always acted upon essentially the same as Done, but
complicates the scheme.

Change-Id: I8d9161fb162195a533c7ed29e251c3f486479dc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-08-09 08:43:51 +02:00
parent a62d979db2
commit 96dd315f61
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -508,7 +508,7 @@ namespace Internal {
enum class RunWorkerState
{
Initialized, Starting, Running, Stopping, Done, Failed
Initialized, Starting, Running, Stopping, Done
};
static QString stateName(RunWorkerState s)
@@ -520,7 +520,6 @@ static QString stateName(RunWorkerState s)
SN(RunWorkerState::Running)
SN(RunWorkerState::Stopping)
SN(RunWorkerState::Done)
SN(RunWorkerState::Failed)
}
return QString("<unknown: %1>").arg(int(s));
# undef SN
@@ -812,12 +811,6 @@ void RunControlPrivate::continueStart()
case RunWorkerState::Stopping:
debugMessage(" " + workerId + " currently stopping");
continue;
case RunWorkerState::Failed:
// Should not happen.
debugMessage(" " + workerId + " failed before");
QTC_CHECK(false);
//setState(RunControlState::Stopped);
break;
case RunWorkerState::Done:
debugMessage(" " + workerId + " was done before");
break;
@@ -877,9 +870,6 @@ void RunControlPrivate::continueStopOrFinish()
case RunWorkerState::Done:
debugMessage(" " + workerId + " was Done. Good.");
break;
case RunWorkerState::Failed:
debugMessage(" " + workerId + " was Failed. Good");
break;
}
} else {
debugMessage("Found unknown deleted worker");
@@ -926,7 +916,7 @@ void RunControlPrivate::onWorkerStarted(RunWorker *worker)
void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
{
worker->d->state = RunWorkerState::Failed;
worker->d->state = RunWorkerState::Done;
showError(msg);
initiateStop();
@@ -952,7 +942,7 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker)
default:
debugMessage(workerId + " stopped unexpectedly in state"
+ stateName(worker->d->state));
worker->d->state = RunWorkerState::Failed;
worker->d->state = RunWorkerState::Done;
break;
}
@@ -964,7 +954,6 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker)
for (RunWorker *dependent : worker->d->stopDependencies) {
switch (dependent->d->state) {
case RunWorkerState::Done:
case RunWorkerState::Failed:
break;
case RunWorkerState::Initialized:
dependent->d->state = RunWorkerState::Done;
@@ -1002,9 +991,6 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker)
case RunWorkerState::Done:
debugMessage(" " + workerId + " was Done. Good.");
break;
case RunWorkerState::Failed:
debugMessage(" " + workerId + " was Failed. Good");
break;
}
} else {
debugMessage("Found unknown deleted worker");
@@ -1466,8 +1452,7 @@ bool RunWorkerPrivate::canStop() const
return false;
for (RunWorker *worker : stopDependencies) {
QTC_ASSERT(worker, continue);
if (worker->d->state != RunWorkerState::Done
&& worker->d->state != RunWorkerState::Failed)
if (worker->d->state != RunWorkerState::Done)
return false;
}
return true;
@@ -1497,7 +1482,7 @@ void RunWorkerPrivate::timerEvent(QTimerEvent *ev)
or a log parser.
A \c RunWorker has a simple state model covering the \c Initialized,
\c Starting, \c Running, \c Stopping, \c Done, and \c Failed states.
\c Starting, \c Running, \c Stopping, and \c Done states.
In the course of the operation of tools several \c RunWorkers
may co-operate and form a combined state that is presented
@@ -1677,11 +1662,6 @@ bool RunWorker::supportsReRunning() const
return d->supportsReRunning;
}
bool RunWorker::hasFailed() const
{
return d->state == RunWorkerState::Failed;
}
QString RunWorker::userMessageForProcessError(QProcess::ProcessError error, const QString &program)
{
QString failedToStart = tr("The process failed to start.");