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

TaskTree: Rename deleteChild() into removeChild()

Browse Source 
We are removing it from the children list, but not deleting it.

Change-Id: Idfd98b45a6163ec05379a44a025db631bfe9fc23
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-07 14:47:22 +01:00
parent 103d67f821
commit e9a3f9ba15
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/solutions/tasking/tasktree.cpp
View File

@@ -1933,7 +1933,7 @@ class RuntimeIteration
public: public:
RuntimeIteration(int index, RuntimeContainer *container); RuntimeIteration(int index, RuntimeContainer *container);
std::optional<Loop> loop() const; std::optional<Loop> loop() const;
void deleteChild(RuntimeTask *node); void removeChild(RuntimeTask *node);
const int m_iterationIndex = 0; const int m_iterationIndex = 0;
const bool m_isProgressive = true; const bool m_isProgressive = true;
@@ -2121,7 +2121,7 @@ std::optional<Loop> RuntimeIteration::loop() const
return m_container->m_containerNode.m_loop; return m_container->m_containerNode.m_loop;
} }
void RuntimeIteration::deleteChild(RuntimeTask *task) void RuntimeIteration::removeChild(RuntimeTask *task)
{ {
const auto it = std::find_if(m_children.cbegin(), m_children.cend(), [task](const auto &ptr) { const auto it = std::find_if(m_children.cbegin(), m_children.cend(), [task](const auto &ptr) {
return ptr.get() == task; return ptr.get() == task;
@@ -2212,7 +2212,7 @@ void TaskTreePrivate::continueContainer(RuntimeContainer *container)
const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error); const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error);
container->m_parentTask->m_setupResult = toSetupResult(result); container->m_parentTask->m_setupResult = toSetupResult(result);
if (parentIteration) { if (parentIteration) {
parentIteration->deleteChild(parentTask); parentIteration->removeChild(parentTask);
if (!parentIteration->m_container->isStarting()) if (!parentIteration->m_container->isStarting())
childDone(parentIteration, result); childDone(parentIteration, result);
} else { } else {
@@ -2271,7 +2271,7 @@ void TaskTreePrivate::startChildren(RuntimeContainer *container)
if (task->m_setupResult == SetupResult::Continue) if (task->m_setupResult == SetupResult::Continue)
continue; continue;
task->m_parentIteration->deleteChild(task.get()); task->m_parentIteration->removeChild(task.get());
childDone(iteration, task->m_setupResult == SetupResult::StopWithSuccess); childDone(iteration, task->m_setupResult == SetupResult::StopWithSuccess);
if (container->m_parentTask->m_setupResult != SetupResult::Continue) if (container->m_parentTask->m_setupResult != SetupResult::Continue)
return; return;
@@ -2378,7 +2378,7 @@ void TaskTreePrivate::startTask(const std::shared_ptr<RuntimeTask> &node)
if (node->m_setupResult != SetupResult::Continue) { if (node->m_setupResult != SetupResult::Continue) {
if (node->m_parentIteration->m_isProgressive) if (node->m_parentIteration->m_isProgressive)
advanceProgress(1); advanceProgress(1);
node->m_parentIteration->deleteChild(node.get()); node->m_parentIteration->removeChild(node.get());
return; return;
} }
QObject::connect(node->m_task.get(), &TaskInterface::done, QObject::connect(node->m_task.get(), &TaskInterface::done,
@@ -2391,7 +2391,7 @@ void TaskTreePrivate::startTask(const std::shared_ptr<RuntimeTask> &node)
if (parentIteration->m_container->isStarting()) if (parentIteration->m_container->isStarting())
return; return;
parentIteration->deleteChild(node.get()); parentIteration->removeChild(node.get());
childDone(parentIteration, result); childDone(parentIteration, result);
bumpAsyncCount(); bumpAsyncCount();
}); });