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

ProjectNodes: add listInProject() to Node

Browse Source 
Add a setter/getter for listInProject to Node and make the project
list all nodes with this property set in Project::files.

Task-number: QTCREATORBUG-18132
Change-Id: I334e627856d1bc0d033e13c5d629f6657d8d7fee
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-05-03 13:46:02 +02:00
parent b0f1aa98a8
commit 0a3409112b
7 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/project.cpp
View File

@@ -548,7 +548,7 @@ Project::RestoreResult Project::restoreSettings(QString *errorMessage)
}
QStringList Project::files(Project::FilesMode fileMode,
const std::function<bool (const FileNode *)> &filter) const
const std::function<bool(const Node *)> &filter) const
{
QStringList result;
@@ -556,17 +556,19 @@ QStringList Project::files(Project::FilesMode fileMode,
return result;
QSet<QString> alreadySeen;
rootProjectNode()->forEachNode([&](const FileNode *fn) {
const QString path = fn->filePath().toString();
rootProjectNode()->forEachGenericNode([&](const Node *n) {
const QString path = n->filePath().toString();
const int count = alreadySeen.count();
alreadySeen.insert(path);
if (count == alreadySeen.count())
return; // skip duplicates
if (filter && !filter(fn))
if (!n->listInProject())
return;
if (filter && !filter(n))
return;
if ((fileMode == AllFiles)
|| (fileMode == SourceFiles && !fn->isGenerated())
|| (fileMode == GeneratedFiles && fn->isGenerated()))
|| (fileMode == SourceFiles && !n->isGenerated())
|| (fileMode == GeneratedFiles && n->isGenerated()))
result.append(path);
});
return result;