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

ProjectExplorer: Minor cleanup

Browse Source 
Change-Id: I9388053eafae661bb16c75917ca8cc738df8b3c1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-05-21 08:26:42 +03:00
committed by Orgad Shaneh
parent 3869af3a15
commit 7a3eb71cf7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -363,14 +363,11 @@ static QList<FileNode *> scanForFilesRecursively(const Utils::FileName &director
const Utils::FileName entryName = Utils::FileName::fromString(entry.absoluteFilePath()); const Utils::FileName entryName = Utils::FileName::fromString(entry.absoluteFilePath());
if (!vcsControl || !vcsControl->isVcsFileOrDirectory(entryName)) { if (!vcsControl || !vcsControl->isVcsFileOrDirectory(entryName)) {
if (entry.isDir()) { if (entry.isDir())
result.append(scanForFilesRecursively(entryName, factory, visited, future, progress, progressIncrement)); result.append(scanForFilesRecursively(entryName, factory, visited, future, progress, progressIncrement));
} else { else if (FileNode *node = factory(entryName))
FileNode *node = factory(entryName);
if (node)
result.append(node); result.append(node);
} }
}
if (future) { if (future) {
progress += progressIncrement; progress += progressIncrement;
const int intProgress = std::min(static_cast<int>(progressStart + progress), future->progressMaximum()); const int intProgress = std::min(static_cast<int>(progressStart + progress), future->progressMaximum());