aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-11-14 11:58:42 +0100
committerTobias Hunger <tobias.hunger@qt.io>2016-11-14 12:30:43 +0000
commite37539a16c5c1990c47d3d95655fb0855e3a7e6a (patch)
tree71c52bdd8b75f128e93891eabbf07af2a9076197
parentff68d4cab1a64f84934cf548843fd4e5bc7fe2a2 (diff)
CMake: TeaLeafReader: Simplify code
Change-Id: Ib615fde89952848c4cfe392a2e84c15f6b73de80 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/tealeafreader.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
index 327a5b1048..17469565f7 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
@@ -360,18 +360,12 @@ void TeaLeafReader::generateProjectTree(CMakeListsNode *root, const QList<FileNo
}
const QList<FileName> allIncludePaths = allIncludePathSet.toList();
- QList<FileNode *> includedHeaderFiles;
- QList<FileNode *> unusedFileNodes;
- std::tie(includedHeaderFiles, unusedFileNodes)
- = Utils::partition(allFiles, [&allIncludePaths](const FileNode *fn) -> bool {
+ const QList<FileNode *> includedHeaderFiles
+ = Utils::filtered(allFiles, [&allIncludePaths](const FileNode *fn) -> bool {
if (fn->fileType() != FileType::Header)
return false;
- for (const FileName &inc : allIncludePaths) {
- if (fn->filePath().isChildOf(inc))
- return true;
- }
- return false;
+ return Utils::contains(allIncludePaths, [fn](const FileName &inc) { return fn->filePath().isChildOf(inc); });
});
const auto knownFiles = QSet<FileName>::fromList(Utils::transform(m_files, [](const FileNode *fn) { return fn->filePath(); }));