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 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 FolderNode::recursiveFileNodes() const -{ - QList result = fileNodes(); - foreach (ProjectExplorer::FolderNode *folder, folderNodes()) - result.append(folder->recursiveFileNodes()); - return result; -} - QList FolderNode::folderNodes() const { QList 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 nodes() const { return m_nodes; } QList fileNodes() const; FileNode *fileNode(const Utils::FileName &file) const; - QList recursiveFileNodes() const; QList folderNodes() const; void addNestedNodes(QList &files, const Utils::FileName &overrideBaseDir = Utils::FileName()); void addNestedNode(FileNode *fileNode, const Utils::FileName &overrideBaseDir = Utils::FileName());