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

TaskTree: Some cosmetic polishing after last refactoring

Browse Source 
Get rid of unneeded local variable.
Use boolean OR instead of bitwise OR (regressed during refactoring).
Assert on parentContainer pointer inside task's done handler.

Amends 5dc4cd837f

Change-Id: I2517b80ae894317c52d46326681021d1133fbae9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Jarek Kobus
2023-02-02 00:30:51 +01:00
parent 9c9e87d509
commit 6570895c0b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/tasktree.cpp
View File

@@ -461,8 +461,7 @@ TaskAction TaskContainer::startChildren(int nextChild)
{
QTC_CHECK(isRunning());
GuardLocker locker(m_runtimeData->m_startGuard);
const int childCount = m_constData.m_children.size();
for (int i = nextChild; i < childCount; ++i) {
for (int i = nextChild; i < m_constData.m_children.size(); ++i) {
const int limit = m_runtimeData->currentLimit();
if (i >= limit)
break;
@@ -489,9 +488,8 @@ TaskAction TaskContainer::childDone(bool success)
{
QTC_CHECK(isRunning());
const int limit = m_runtimeData->currentLimit(); // Read before bumping m_doneCount and stop()
const bool shouldStop
= (m_constData.m_workflowPolicy == WorkflowPolicy::StopOnDone && success)
| (m_constData.m_workflowPolicy == WorkflowPolicy::StopOnError && !success);
const bool shouldStop = (m_constData.m_workflowPolicy == WorkflowPolicy::StopOnDone && success)
|| (m_constData.m_workflowPolicy == WorkflowPolicy::StopOnError && !success);
if (shouldStop)
stop();
@@ -499,7 +497,7 @@ TaskAction TaskContainer::childDone(bool success)
const bool updatedSuccess = m_runtimeData->updateSuccessBit(success);
const TaskAction startAction
= (shouldStop || m_runtimeData->m_doneCount == m_constData.m_children.size())
? toTaskAction(updatedSuccess) : TaskAction::Continue;
? toTaskAction(updatedSuccess) : TaskAction::Continue;
if (isStarting())
return startAction;
@@ -552,7 +550,7 @@ TaskAction TaskNode::start()
invokeEndHandler(success);
disconnect(m_task.get(), &TaskInterface::done, this, nullptr);
m_task.release()->deleteLater();
QTC_ASSERT(parentContainer()->isRunning(), return);
QTC_ASSERT(parentContainer() && parentContainer()->isRunning(), return);
if (parentContainer()->isStarting())
*unwindAction = toTaskAction(success);
else