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

ProjectExplorer: Rename RunWorker::displayName to Id

Browse Source 
... and remove getter. It's only a debugging aid.

Change-Id: I760dcddbfa1a5669c545ed8e9552381031836bd0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-06-26 18:01:59 +02:00
parent 06014fb56f
commit b18f9db8d7
2 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -571,7 +571,7 @@ public:
RunWorkerState state = RunWorkerState::Initialized; RunWorkerState state = RunWorkerState::Initialized;
RunControl *runControl; RunControl *runControl;
QList<RunWorker *> dependencies; QList<RunWorker *> dependencies;
QString displayName; QString id;
QVariantMap data; QVariantMap data;
int startWatchdogInterval = 0; int startWatchdogInterval = 0;
@@ -793,37 +793,38 @@ void RunControlPrivate::continueStart()
debugMessage("Looking for next worker"); debugMessage("Looking for next worker");
for (RunWorker *worker : m_workers) { for (RunWorker *worker : m_workers) {
if (worker) { if (worker) {
debugMessage(" Examining worker " + worker->displayName()); const QString &workerId = worker->d->id;
debugMessage(" Examining worker " + workerId);
switch (worker->d->state) { switch (worker->d->state) {
case RunWorkerState::Initialized: case RunWorkerState::Initialized:
debugMessage(" " + worker->displayName() + " is not done yet."); debugMessage(" " + workerId + " is not done yet.");
if (worker->d->canStart()) { if (worker->d->canStart()) {
debugMessage("Starting " + worker->displayName()); debugMessage("Starting " + workerId);
worker->d->state = RunWorkerState::Starting; worker->d->state = RunWorkerState::Starting;
QTimer::singleShot(0, worker, &RunWorker::initiateStart); QTimer::singleShot(0, worker, &RunWorker::initiateStart);
return; return;
} }
allDone = false; allDone = false;
debugMessage(" " + worker->displayName() + " cannot start."); debugMessage(" " + workerId + " cannot start.");
break; break;
case RunWorkerState::Starting: case RunWorkerState::Starting:
debugMessage(" " + worker->displayName() + " currently starting"); debugMessage(" " + workerId + " currently starting");
allDone = false; allDone = false;
break; break;
case RunWorkerState::Running: case RunWorkerState::Running:
debugMessage(" " + worker->displayName() + " currently running"); debugMessage(" " + workerId + " currently running");
break; break;
case RunWorkerState::Stopping: case RunWorkerState::Stopping:
debugMessage(" " + worker->displayName() + " currently stopping"); debugMessage(" " + workerId + " currently stopping");
continue; continue;
case RunWorkerState::Failed: case RunWorkerState::Failed:
// Should not happen. // Should not happen.
debugMessage(" " + worker->displayName() + " failed before"); debugMessage(" " + workerId + " failed before");
QTC_CHECK(false); QTC_CHECK(false);
//setState(RunControlState::Stopped); //setState(RunControlState::Stopped);
break; break;
case RunWorkerState::Done: case RunWorkerState::Done:
debugMessage(" " + worker->displayName() + " was done before"); debugMessage(" " + workerId + " was done before");
break; break;
} }
} else { } else {
@@ -849,30 +850,31 @@ void RunControlPrivate::continueStop()
checkState(RunControlState::Stopping); checkState(RunControlState::Stopping);
for (RunWorker *worker : m_workers) { for (RunWorker *worker : m_workers) {
if (worker) { if (worker) {
debugMessage(" Examining worker " + worker->displayName()); const QString &workerId = worker->d->id;
debugMessage(" Examining worker " + workerId);
switch (worker->d->state) { switch (worker->d->state) {
case RunWorkerState::Initialized: case RunWorkerState::Initialized:
debugMessage(" " + worker->displayName() + " was Initialized, setting to Done"); debugMessage(" " + workerId + " was Initialized, setting to Done");
worker->d->state = RunWorkerState::Done; worker->d->state = RunWorkerState::Done;
break; break;
case RunWorkerState::Stopping: case RunWorkerState::Stopping:
debugMessage(" " + worker->displayName() + " was already Stopping. Keeping it that way"); debugMessage(" " + workerId + " was already Stopping. Keeping it that way");
break; break;
case RunWorkerState::Starting: case RunWorkerState::Starting:
worker->d->state = RunWorkerState::Stopping; worker->d->state = RunWorkerState::Stopping;
debugMessage(" " + worker->displayName() + " was Starting, queuing stop"); debugMessage(" " + workerId + " was Starting, queuing stop");
QTimer::singleShot(0, worker, &RunWorker::initiateStop); QTimer::singleShot(0, worker, &RunWorker::initiateStop);
return; // Sic. return; // Sic.
case RunWorkerState::Running: case RunWorkerState::Running:
debugMessage(" " + worker->displayName() + " was Running, queuing stop"); debugMessage(" " + workerId + " was Running, queuing stop");
worker->d->state = RunWorkerState::Stopping; worker->d->state = RunWorkerState::Stopping;
QTimer::singleShot(0, worker, &RunWorker::initiateStop); QTimer::singleShot(0, worker, &RunWorker::initiateStop);
return; // Sic. return; // Sic.
case RunWorkerState::Done: case RunWorkerState::Done:
debugMessage(" " + worker->displayName() + " was Done. Good."); debugMessage(" " + workerId + " was Done. Good.");
break; break;
case RunWorkerState::Failed: case RunWorkerState::Failed:
debugMessage(" " + worker->displayName() + " was Failed. Good"); debugMessage(" " + workerId + " was Failed. Good");
break; break;
} }
} else { } else {
@@ -888,13 +890,13 @@ void RunControlPrivate::onWorkerStarted(RunWorker *worker)
worker->d->state = RunWorkerState::Running; worker->d->state = RunWorkerState::Running;
if (state == RunControlState::Starting) { if (state == RunControlState::Starting) {
debugMessage(worker->displayName() + " start succeeded"); debugMessage(worker->d->id + " start succeeded");
continueStart(); continueStart();
return; return;
} }
showError(tr("Unexpected run control state %1 when worker %2 started") showError(tr("Unexpected run control state %1 when worker %2 started")
.arg(stateName(state)) .arg(stateName(state))
.arg(worker->displayName())); .arg(worker->d->id));
//setState(RunControlState::Stopped); //setState(RunControlState::Stopped);
} }
@@ -908,18 +910,19 @@ void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
void RunControlPrivate::onWorkerStopped(RunWorker *worker) void RunControlPrivate::onWorkerStopped(RunWorker *worker)
{ {
const QString &workerId = worker->d->id;
switch (worker->d->state) { switch (worker->d->state) {
case RunWorkerState::Running: case RunWorkerState::Running:
// That was a spontaneous stop. // That was a spontaneous stop.
worker->d->state = RunWorkerState::Done; worker->d->state = RunWorkerState::Done;
debugMessage(worker->displayName() + " stopped spontaneously."); debugMessage(workerId + " stopped spontaneously.");
break; break;
case RunWorkerState::Stopping: case RunWorkerState::Stopping:
worker->d->state = RunWorkerState::Done; worker->d->state = RunWorkerState::Done;
debugMessage(worker->displayName() + " stopped expectedly."); debugMessage(workerId + " stopped expectedly.");
break; break;
default: default:
debugMessage(worker->displayName() + " stopped unexpectedly in state" debugMessage(workerId + " stopped unexpectedly in state"
+ stateName(worker->d->state)); + stateName(worker->d->state));
worker->d->state = RunWorkerState::Failed; worker->d->state = RunWorkerState::Failed;
break; break;
@@ -1420,7 +1423,7 @@ void RunWorker::initiateStop()
if (d->stopWatchdogInterval != 0) if (d->stopWatchdogInterval != 0)
d->stopWatchdogTimerId = d->startTimer(d->stopWatchdogInterval); d->stopWatchdogTimerId = d->startTimer(d->stopWatchdogInterval);
d->runControl->d->debugMessage("Initiate stop for " + displayName()); d->runControl->d->debugMessage("Initiate stop for " + d->id);
stop(); stop();
} }
@@ -1475,14 +1478,9 @@ RunControl *RunWorker::runControl() const
return d->runControl; return d->runControl;
} }
QString RunWorker::displayName() const void RunWorker::setId(const QString &id)
{ {
return d->displayName; d->id = id;
}
void RunWorker::setDisplayName(const QString &displayName)
{
d->displayName = displayName;
} }
void RunWorker::setStartTimeout(int ms) void RunWorker::setStartTimeout(int ms)

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

@@ -366,8 +366,8 @@ public:
void addDependency(RunWorker *dependency); void addDependency(RunWorker *dependency);
QString displayName() const; void setDisplayName(const QString &id) { setId(id); } // FIXME: Obsoleted by setId.
void setDisplayName(const QString &displayName); void setId(const QString &id);
void setStartTimeout(int ms); void setStartTimeout(int ms);
void setStopTimeout(int ms); void setStopTimeout(int ms);