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

CMake: Remove unneeded filter

Browse Source 
The TODO was done in 1b2fc1c815.

Change-Id: I9b1ff1aeccdaa71f7ea4d75d935dd09182e39def
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-05-21 08:27:58 +03:00
committed by Orgad Shaneh
parent 636549888a
commit b272bf3dc0
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cmakeprojectmanager/treescanner.cpp
View File

@@ -151,12 +151,9 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc
Result nodes = FileNode::scanForFiles(directory, Result nodes = FileNode::scanForFiles(directory,
[&filter, &factory](const Utils::FileName &fn) -> FileNode * { [&filter, &factory](const Utils::FileName &fn) -> FileNode * {
QTC_ASSERT(!fn.isEmpty(), return nullptr);
const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn.toString()); const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn.toString());
// Skip some files during scan. // Skip some files during scan.
// Filter out nullptr records after.
if (filter && filter(mimeType, fn)) if (filter && filter(mimeType, fn))
return nullptr; return nullptr;
@@ -169,16 +166,10 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc
}, },
fip.get()); fip.get());
// Clean up nodes and keep it sorted Utils::sort(nodes, ProjectExplorer::Node::sortByPath);
Result tmp = Utils::filtered(nodes, [](const FileNode *fn) -> bool {
// Simple skip null entries
// TODO: fix Node::scanForFiles() to skip null factory results
return fn;
});
Utils::sort(tmp, ProjectExplorer::Node::sortByPath);
fip->setProgressValue(fip->progressMaximum()); fip->setProgressValue(fip->progressMaximum());
fip->reportResult(tmp); fip->reportResult(nodes);
fip->reportFinished(); fip->reportFinished();
} }