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

CMake: TeaLeafReader: Simplify code

Browse Source 
Change-Id: Ib615fde89952848c4cfe392a2e84c15f6b73de80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-14 11:58:42 +01:00
parent ff68d4cab1
commit e37539a16c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -360,18 +360,12 @@ void TeaLeafReader::generateProjectTree(CMakeListsNode *root, const QList<FileNo
} }
const QList<FileName> allIncludePaths = allIncludePathSet.toList(); const QList<FileName> allIncludePaths = allIncludePathSet.toList();
QList<FileNode *> includedHeaderFiles; const QList<FileNode *> includedHeaderFiles
QList<FileNode *> unusedFileNodes; = Utils::filtered(allFiles, [&allIncludePaths](const FileNode *fn) -> bool {
std::tie(includedHeaderFiles, unusedFileNodes)
= Utils::partition(allFiles, [&allIncludePaths](const FileNode *fn) -> bool {
if (fn->fileType() != FileType::Header) if (fn->fileType() != FileType::Header)
return false; return false;
for (const FileName &inc : allIncludePaths) { return Utils::contains(allIncludePaths, [fn](const FileName &inc) { return fn->filePath().isChildOf(inc); });
if (fn->filePath().isChildOf(inc))
return true;
}
return false;
}); });
const auto knownFiles = QSet<FileName>::fromList(Utils::transform(m_files, [](const FileNode *fn) { return fn->filePath(); })); const auto knownFiles = QSet<FileName>::fromList(Utils::transform(m_files, [](const FileNode *fn) { return fn->filePath(); }));