From 4f47a8d74572ad28bce44120d2afabc47738e27d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 23 Feb 2017 10:52:00 +0100
Subject: [PATCH] ProjectExplorer: Remove FolderNode::projectNodes()

Merged into the using code now.

Change-Id: I4b39998799dde530ab48c504ac2a389d72705c4f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/projectexplorer/projectmodels.cpp  | 18 ++++++++++--------
 src/plugins/projectexplorer/projectnodes.cpp   | 10 ----------
 src/plugins/projectexplorer/projectnodes.h     |  3 ---
 .../projectexplorer/projectwizardpage.cpp      |  9 +++++----
 src/plugins/qmakeprojectmanager/qmakenodes.cpp |  5 +++--
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 9a4d9668576..2940b4cc575 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -218,10 +218,11 @@ void FlatModel::rebuildModel()
     QSet<Node *> seen;
 
     rootItem()->removeChildren();
-    const QList<ProjectNode *> projectNodes = SessionManager::sessionNode()->projectNodes();
-    for (ProjectNode *projectNode : projectNodes) {
-        if (!seen.contains(projectNode))
-            addProjectNode(rootItem(), projectNode, &seen);
+    for (Node *node : SessionManager::sessionNode()->nodes()) {
+        if (ProjectNode *projectNode = node->asProjectNode()) {
+            if (!seen.contains(projectNode))
+                addProjectNode(rootItem(), projectNode, &seen);
+        }
     }
     rootItem()->sortChildren(&sortWrapperNodes);
 
@@ -284,10 +285,11 @@ void FlatModel::addProjectNode(WrapperNode *parent, ProjectNode *projectNode, QS
     auto node = new WrapperNode(projectNode);
     parent->appendChild(node);
     addFolderNode(node, projectNode, seen);
-    const QList<ProjectNode *> subProjectNodes = projectNode->projectNodes();
-    for (ProjectNode *subProjectNode : subProjectNodes) {
-        if (!seen->contains(subProjectNode))
-            addProjectNode(node, subProjectNode, seen);
+    for (Node *subNode : projectNode->nodes()) {
+        if (ProjectNode *subProjectNode = subNode->asProjectNode()) {
+            if (!seen->contains(subProjectNode))
+                addProjectNode(node, subProjectNode, seen);
+        }
     }
     node->sortChildren(&sortWrapperNodes);
 }
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index ef94bf0e95e..55c6481e0c4 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -764,16 +764,6 @@ ProjectNode *ProjectNode::projectNode(const Utils::FileName &file) const
     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
 {
     return m_nodes.isEmpty();
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index e6427b2627c..a69e874fd5b 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -242,9 +242,6 @@ public:
     void addNode(Node *node);
     void removeNode(Node *node);
 
-    // all subFolders that are projects
-    QList<ProjectNode*> projectNodes() const;
-
     void makeEmpty();
     bool isEmpty() const;
 
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index 1435ecb3141..2a455525f75 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -293,10 +293,11 @@ static inline AddNewTree *buildAddFilesTree(SessionNode *root, const QStringList
                                             Node *contextNode, BestNodeSelector *selector)
 {
     QList<AddNewTree *> children;
-    foreach (ProjectNode *pn, root->projectNodes()) {
-        AddNewTree *child = buildAddFilesTree(pn, files, contextNode, selector);
-        if (child)
-            children.append(child);
+    for (Node *node : root->nodes()) {
+        if (ProjectNode *pn = node->asProjectNode()) {
+            if (AddNewTree *child = buildAddFilesTree(pn, files, contextNode, selector))
+                children.append(child);
+        }
     }
     children.prepend(createNoneNode(selector));
     return new AddNewTree(root, children, root->displayName());
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 7245ff979cb..a312a78baca 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -202,10 +202,11 @@ QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) con
 {
     if (fileName == filePath())
         return const_cast<QmakeProFileNode *>(this);
-    foreach (ProjectNode *pn, projectNodes())
-        if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(pn))
+    for (Node *node : nodes()) {
+        if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(node))
             if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName))
                 return result;
+    }
     return nullptr;
 }