From a6a271881f77b3de36ac897776e2a4ac00228552 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 10 Mar 2017 18:08:03 +0100
Subject: [PATCH] ProjectExplorer: Inline FolderNode::recursiveFileNodes()

... into its only remaining user.

Change-Id: I5efa716ce34ba6a237dfcbcfebb257c863fdd21d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 .../cmakeprojectmanager/cmakeproject.cpp      | 20 +++++++------------
 src/plugins/projectexplorer/projectnodes.cpp  |  8 --------
 src/plugins/projectexplorer/projectnodes.h    |  1 -
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 1ecc0c6e5ee..9339591c939 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -309,21 +309,15 @@ QString CMakeProject::displayName() const
 
 QStringList CMakeProject::files(FilesMode fileMode) const
 {
-    const QList<FileNode *> nodes = filtered(rootProjectNode()->recursiveFileNodes(),
-                                             [fileMode](const FileNode *fn) {
+    QStringList result;
+    rootProjectNode()->forEachNode([&](const FileNode *fn) {
         const bool isGenerated = fn->isGenerated();
-        switch (fileMode)
-        {
-        case Project::SourceFiles:
-            return !isGenerated;
-        case Project::GeneratedFiles:
-            return isGenerated;
-        case Project::AllFiles:
-        default:
-            return true;
-        }
+        if (fileMode == Project::SourceFiles && !isGenerated)
+            result.append(fn->filePath().toString());
+        if (fileMode == Project::GeneratedFiles && isGenerated)
+            result.append(fn->filePath().toString());
     });
-    return transform(nodes, [fileMode](const FileNode* fn) { return fn->filePath().toString(); });
+    return result;
 }
 
 Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *errorMessage)
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 604d73cb16a..8067795304f 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -450,14 +450,6 @@ FileNode *FolderNode::fileNode(const Utils::FileName &file) const
     }));
 }
 
-QList<FileNode *> FolderNode::recursiveFileNodes() const
-{
-    QList<FileNode *> result = fileNodes();
-    foreach (ProjectExplorer::FolderNode *folder, folderNodes())
-        result.append(folder->recursiveFileNodes());
-    return result;
-}
-
 QList<FolderNode*> FolderNode::folderNodes() const
 {
     QList<FolderNode *> result;
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index e740c3c5e7a..aa5b9e397f2 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -199,7 +199,6 @@ public:
     const QList<Node *> nodes() const { return m_nodes; }
     QList<FileNode *> fileNodes() const;
     FileNode *fileNode(const Utils::FileName &file) const;
-    QList<FileNode *> recursiveFileNodes() const;
     QList<FolderNode *> folderNodes() const;
     void addNestedNodes(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName());
     void addNestedNode(FileNode *fileNode, const Utils::FileName &overrideBaseDir = Utils::FileName());