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

TaskTree: Get rid of public getters from GroupItem

Browse Source 
Make friends to concerned classes instead.

Change-Id: I6b59b9e50129ab340c33fb3b6910bcbdc4b769f0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-11-05 00:25:16 +01:00
parent a0db7c7991
commit de24f309a4
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1078,7 +1078,7 @@ class TaskNode
public: public:
TaskNode(TaskTreePrivate *taskTreePrivate, const GroupItem &task, TaskNode(TaskTreePrivate *taskTreePrivate, const GroupItem &task,
TaskContainer *parentContainer) TaskContainer *parentContainer)
: m_taskHandler(task.taskHandler()) : m_taskHandler(task.m_taskHandler)
, m_container(taskTreePrivate, task, this, parentContainer) , m_container(taskTreePrivate, task, this, parentContainer)
{} {}
@@ -1202,10 +1202,9 @@ ReturnType invokeHandler(TaskContainer *container, Handler &&handler, Args &&...
} }
static QList<TaskNode *> createChildren(TaskTreePrivate *taskTreePrivate, TaskContainer *container, static QList<TaskNode *> createChildren(TaskTreePrivate *taskTreePrivate, TaskContainer *container,
const GroupItem &task) const QList<GroupItem> &children)
{ {
QList<TaskNode *> result; QList<TaskNode *> result;
const QList<GroupItem> &children = task.children();
for (const GroupItem &child : children) for (const GroupItem &child : children)
result.append(new TaskNode(taskTreePrivate, child, container)); result.append(new TaskNode(taskTreePrivate, child, container));
return result; return result;
@@ -1217,11 +1216,11 @@ TaskContainer::ConstData::ConstData(TaskTreePrivate *taskTreePrivate, const Grou
: m_taskTreePrivate(taskTreePrivate) : m_taskTreePrivate(taskTreePrivate)
, m_parentNode(parentNode) , m_parentNode(parentNode)
, m_parentContainer(parentContainer) , m_parentContainer(parentContainer)
, m_parallelLimit(task.groupData().m_parallelLimit.value_or(1)) , m_parallelLimit(task.m_groupData.m_parallelLimit.value_or(1))
, m_workflowPolicy(task.groupData().m_workflowPolicy.value_or(WorkflowPolicy::StopOnError)) , m_workflowPolicy(task.m_groupData.m_workflowPolicy.value_or(WorkflowPolicy::StopOnError))
, m_groupHandler(task.groupData().m_groupHandler) , m_groupHandler(task.m_groupData.m_groupHandler)
, m_storageList(taskTreePrivate->addStorages(task.storageList())) , m_storageList(taskTreePrivate->addStorages(task.m_storageList))
, m_children(createChildren(taskTreePrivate, thisContainer, task)) , m_children(createChildren(taskTreePrivate, thisContainer, task.m_children))
, m_taskCount(std::accumulate(m_children.cbegin(), m_children.cend(), 0, , m_taskCount(std::accumulate(m_children.cbegin(), m_children.cend(), 0,
[](int r, TaskNode *n) { return r + n->taskCount(); })) [](int r, TaskNode *n) { return r + n->taskCount(); }))
{} {}

7
src/libs/solutions/tasking/tasktree.h
View File

@@ -181,11 +181,6 @@ public:
std::optional<WorkflowPolicy> m_workflowPolicy = {}; std::optional<WorkflowPolicy> m_workflowPolicy = {};
}; };
QList<GroupItem> children() const { return m_children; }
GroupData groupData() const { return m_groupData; }
QList<TreeStorageBase> storageList() const { return m_storageList; }
TaskHandler taskHandler() const { return m_taskHandler; }
protected: protected:
enum class Type { enum class Type {
List, List,
@@ -226,6 +221,8 @@ protected:
} }
private: private:
friend class TaskContainer;
friend class TaskNode;
Type m_type = Type::Group; Type m_type = Type::Group;
QList<GroupItem> m_children; QList<GroupItem> m_children;
GroupData m_groupData; GroupData m_groupData;