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

ProjectExplorer: Slim down user side ProjectNode handling

Browse Source 
Change-Id: If727ff6cd09cc127e031c49c47f61ffda631a80e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-01-26 11:58:57 +01:00
parent cd70da5dcd
commit beaba559a5
8 changed files with 46 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -185,11 +185,6 @@ void Node::emitTreeChanged()
ProjectTree::emitDataChanged();
}
Node *Node::trim(const QSet<Node *> &keepers)
{
return keepers.contains(this) ? nullptr : this;
}
bool Node::sortByPath(const Node *a, const Node *b)
{
return a->filePath() < b->filePath();
@@ -339,26 +334,6 @@ QIcon FolderNode::icon() const
return m_icon;
}
Node *FolderNode::trim(const QSet<Node *> &keepers)
{
if (keepers.contains(this))
return nullptr;
bool keepThis = false;
QList<Node *> toTrim = Utils::transform(m_fileNodes, [&keepers](Node *n) { return n->trim(keepers); });
int count = toTrim.count();
toTrim = Utils::filtered(toTrim, [](const Node *n) { return n; });
keepThis = (count != toTrim.count());
removeFileNodes(Utils::transform(toTrim, [](Node *n) { return static_cast<FileNode *>(n); }));
toTrim = Utils::transform(m_folderNodes, [&keepers](Node *n) { return n->trim(keepers); });
count = toTrim.count();
toTrim = Utils::filtered(toTrim, [](const Node *n) { return n; });
keepThis = keepThis || (count != toTrim.count());
removeFolderNodes(Utils::transform(toTrim, [](Node *n) { return static_cast<FolderNode *>(n); }));
return keepThis ? nullptr : this;
}
QList<FileNode*> FolderNode::fileNodes() const
{
return m_fileNodes;
@@ -829,26 +804,20 @@ QList<ProjectNode*> ProjectNode::projectNodes() const
Adds project nodes specified by \a subProjects to the node hierarchy and
emits the corresponding signals.
*/
void ProjectNode::addProjectNodes(const QList<ProjectNode*> &subProjects)
void ProjectNode::addProjectNode(ProjectNode *subProject)
{
if (!subProjects.isEmpty()) {
QList<FolderNode*> folderNodes;
foreach (ProjectNode *projectNode, subProjects)
folderNodes << projectNode;
QTC_ASSERT(subProject, return);
QTC_ASSERT(!subProject->parentFolderNode(), return);
foreach (ProjectNode *project, subProjects) {
QTC_ASSERT(!project->parentFolderNode() || project->parentFolderNode() == this,
qDebug("Project node has already a parent"));
project->setParentFolderNode(this);
m_folderNodes.append(project);
m_projectNodes.append(project);
}
subProject->setParentFolderNode(this);
m_folderNodes.append(subProject);
m_projectNodes.append(subProject);
Utils::sort(m_folderNodes);
Utils::sort(m_projectNodes);
}
Utils::sort(m_folderNodes);
Utils::sort(m_projectNodes);
}
/*!
Removes project nodes specified by \a subProjects from the node hierarchy
and emits the corresponding signals.
@@ -856,50 +825,20 @@ void ProjectNode::addProjectNodes(const QList<ProjectNode*> &subProjects)
All objects in the \a subProjects list are deleted.
*/
void ProjectNode::removeProjectNodes(const QList<ProjectNode*> &subProjects)
void ProjectNode::removeProjectNodes()
{
if (!subProjects.isEmpty()) {
QList<FolderNode*> toRemove;
foreach (ProjectNode *projectNode, subProjects)
toRemove << projectNode;
Utils::sort(toRemove);
foreach (ProjectNode *subProject, m_projectNodes)
m_folderNodes.removeAll(subProject);
auto toRemoveIter = toRemove.constBegin();
auto folderIter = m_folderNodes.begin();
auto projectIter = m_projectNodes.begin();
for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) {
while (*projectIter != *toRemoveIter) {
++projectIter;
QTC_ASSERT(projectIter != m_projectNodes.end(),
qDebug("Project to remove is not part of specified folder!"));
}
while (*folderIter != *toRemoveIter) {
++folderIter;
QTC_ASSERT(folderIter != m_folderNodes.end(),
qDebug("Project to remove is not part of specified folder!"));
}
delete *projectIter;
projectIter = m_projectNodes.erase(projectIter);
folderIter = m_folderNodes.erase(folderIter);
}
}
qDeleteAll(m_projectNodes);
m_projectNodes.clear();
}
Node *ProjectNode::trim(const QSet<Node *> &keepers)
void ProjectNode::removeProjectNode(ProjectNode *subProject)
{
if (keepers.contains(this))
return nullptr;
QList<Node *> toTrim
= Utils::transform(m_projectNodes, [&keepers](Node *n) { return n->trim(keepers); });
int count = toTrim.count();
toTrim = Utils::filtered(toTrim, [](Node *n) { return n; });
removeProjectNodes(Utils::transform(toTrim, [](Node *n) { return static_cast<ProjectNode *>(n); }));
if (!FolderNode::trim(keepers))
return nullptr;
return (toTrim.count() != count) ? nullptr : this;
m_projectNodes.removeOne(subProject);
m_folderNodes.removeOne(subProject);
delete subProject;
}
/*!