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

ProjectExplorer: Remove FolderNode::projectNodes()

Browse Source 
Merged into the using code now.

Change-Id: I4b39998799dde530ab48c504ac2a389d72705c4f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-02-23 10:52:00 +01:00
parent 151ae22bb9
commit 4f47a8d745
5 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -218,10 +218,11 @@ void FlatModel::rebuildModel()
QSet<Node *> seen; QSet<Node *> seen;
rootItem()->removeChildren(); rootItem()->removeChildren();
const QList<ProjectNode *> projectNodes = SessionManager::sessionNode()->projectNodes(); for (Node *node : SessionManager::sessionNode()->nodes()) {
for (ProjectNode *projectNode : projectNodes) { if (ProjectNode *projectNode = node->asProjectNode()) {
if (!seen.contains(projectNode)) if (!seen.contains(projectNode))
addProjectNode(rootItem(), projectNode, &seen); addProjectNode(rootItem(), projectNode, &seen);
}
} }
rootItem()->sortChildren(&sortWrapperNodes); rootItem()->sortChildren(&sortWrapperNodes);
@@ -284,10 +285,11 @@ void FlatModel::addProjectNode(WrapperNode *parent, ProjectNode *projectNode, QS
auto node = new WrapperNode(projectNode); auto node = new WrapperNode(projectNode);
parent->appendChild(node); parent->appendChild(node);
addFolderNode(node, projectNode, seen); addFolderNode(node, projectNode, seen);
const QList<ProjectNode *> subProjectNodes = projectNode->projectNodes(); for (Node *subNode : projectNode->nodes()) {
for (ProjectNode *subProjectNode : subProjectNodes) { if (ProjectNode *subProjectNode = subNode->asProjectNode()) {
if (!seen->contains(subProjectNode)) if (!seen->contains(subProjectNode))
addProjectNode(node, subProjectNode, seen); addProjectNode(node, subProjectNode, seen);
}
} }
node->sortChildren(&sortWrapperNodes); node->sortChildren(&sortWrapperNodes);
} }

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

@@ -764,16 +764,6 @@ ProjectNode *ProjectNode::projectNode(const Utils::FileName &file) const
return nullptr; return nullptr;
} }
QList<ProjectNode*> FolderNode::projectNodes() const
{
QList<ProjectNode *> nodes;
for (Node *node : m_nodes) {
if (ProjectNode *pnode = node->asProjectNode())
nodes.append(pnode);
}
return nodes;
}
bool FolderNode::isEmpty() const bool FolderNode::isEmpty() const
{ {
return m_nodes.isEmpty(); return m_nodes.isEmpty();

3
src/plugins/projectexplorer/projectnodes.h
View File

@@ -242,9 +242,6 @@ public:
void addNode(Node *node); void addNode(Node *node);
void removeNode(Node *node); void removeNode(Node *node);
// all subFolders that are projects
QList<ProjectNode*> projectNodes() const;
void makeEmpty(); void makeEmpty();
bool isEmpty() const; bool isEmpty() const;

9
src/plugins/projectexplorer/projectwizardpage.cpp
View File

@@ -293,10 +293,11 @@ static inline AddNewTree *buildAddFilesTree(SessionNode *root, const QStringList
Node *contextNode, BestNodeSelector *selector) Node *contextNode, BestNodeSelector *selector)
{ {
QList<AddNewTree *> children; QList<AddNewTree *> children;
foreach (ProjectNode *pn, root->projectNodes()) { for (Node *node : root->nodes()) {
AddNewTree *child = buildAddFilesTree(pn, files, contextNode, selector); if (ProjectNode *pn = node->asProjectNode()) {
if (child) if (AddNewTree *child = buildAddFilesTree(pn, files, contextNode, selector))
children.append(child); children.append(child);
}
} }
children.prepend(createNoneNode(selector)); children.prepend(createNoneNode(selector));
return new AddNewTree(root, children, root->displayName()); return new AddNewTree(root, children, root->displayName());

5
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -202,10 +202,11 @@ QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) con
{ {
if (fileName == filePath()) if (fileName == filePath())
return const_cast<QmakeProFileNode *>(this); return const_cast<QmakeProFileNode *>(this);
foreach (ProjectNode *pn, projectNodes()) for (Node *node : nodes()) {
if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(pn)) if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(node))
if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName)) if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName))
return result; return result;
}
return nullptr; return nullptr;
} }