From b272bf3dc0bd029b493eea85a808b69717fbf27d Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 21 May 2017 08:27:58 +0300 Subject: [PATCH] CMake: Remove unneeded filter The TODO was done in 1b2fc1c815. Change-Id: I9b1ff1aeccdaa71f7ea4d75d935dd09182e39def Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/treescanner.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/treescanner.cpp b/src/plugins/cmakeprojectmanager/treescanner.cpp index 6951221dd89..7bb4ed259e3 100644 --- a/src/plugins/cmakeprojectmanager/treescanner.cpp +++ b/src/plugins/cmakeprojectmanager/treescanner.cpp @@ -151,12 +151,9 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc Result nodes = FileNode::scanForFiles(directory, [&filter, &factory](const Utils::FileName &fn) -> FileNode * { - QTC_ASSERT(!fn.isEmpty(), return nullptr); - const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn.toString()); // Skip some files during scan. - // Filter out nullptr records after. if (filter && filter(mimeType, fn)) return nullptr; @@ -169,16 +166,10 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc }, fip.get()); - // Clean up nodes and keep it sorted - 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); + Utils::sort(nodes, ProjectExplorer::Node::sortByPath); fip->setProgressValue(fip->progressMaximum()); - fip->reportResult(tmp); + fip->reportResult(nodes); fip->reportFinished(); }