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

ProjectExplorer: Inline FolderNode::recursiveFileNodes()

Browse Source 
... into its only remaining user.

Change-Id: I5efa716ce34ba6a237dfcbcfebb257c863fdd21d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-03-10 18:08:03 +01:00
parent 4d8352a6c1
commit a6a271881f
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -309,21 +309,15 @@ QString CMakeProject::displayName() const
QStringList CMakeProject::files(FilesMode fileMode) const QStringList CMakeProject::files(FilesMode fileMode) const
{ {
const QList<FileNode *> nodes = filtered(rootProjectNode()->recursiveFileNodes(), QStringList result;
[fileMode](const FileNode *fn) { rootProjectNode()->forEachNode([&](const FileNode *fn) {
const bool isGenerated = fn->isGenerated(); const bool isGenerated = fn->isGenerated();
switch (fileMode) if (fileMode == Project::SourceFiles && !isGenerated)
{ result.append(fn->filePath().toString());
case Project::SourceFiles: if (fileMode == Project::GeneratedFiles && isGenerated)
return !isGenerated; result.append(fn->filePath().toString());
case Project::GeneratedFiles:
return isGenerated;
case Project::AllFiles:
default:
return true;
}
}); });
return transform(nodes, [fileMode](const FileNode* fn) { return fn->filePath().toString(); }); return result;
} }
Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *errorMessage) Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *errorMessage)

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

@@ -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*> FolderNode::folderNodes() const
{ {
QList<FolderNode *> result; QList<FolderNode *> result;

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

@@ -199,7 +199,6 @@ public:
const QList<Node *> nodes() const { return m_nodes; } const QList<Node *> nodes() const { return m_nodes; }
QList<FileNode *> fileNodes() const; QList<FileNode *> fileNodes() const;
FileNode *fileNode(const Utils::FileName &file) const; FileNode *fileNode(const Utils::FileName &file) const;
QList<FileNode *> recursiveFileNodes() const;
QList<FolderNode *> folderNodes() const; QList<FolderNode *> folderNodes() const;
void addNestedNodes(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName()); void addNestedNodes(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName());
void addNestedNode(FileNode *fileNode, const Utils::FileName &overrideBaseDir = Utils::FileName()); void addNestedNode(FileNode *fileNode, const Utils::FileName &overrideBaseDir = Utils::FileName());