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

remove redundancy from QmakePriFileNode::recursiveEnumerate()

Browse Source 
we *know* that this function is called only with folders; it's part of
its api.

Change-Id: Idada1e6672a916c0d550d191770396ebbc54b02f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oswald Buddenhagen
2016-10-21 15:27:51 +02:00
parent bd3f39a358
commit b8ea6e8f0e
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -622,20 +622,14 @@ QStringList QmakePriFileNode::fullVPaths(const QStringList &baseVPaths, QtSuppor
QSet<FileName> QmakePriFileNode::recursiveEnumerate(const QString &folder) QSet<FileName> QmakePriFileNode::recursiveEnumerate(const QString &folder)
{ {
QSet<FileName> result; QSet<FileName> result;
QFileInfo fi(folder);
if (fi.isDir()) {
QDir dir(folder); QDir dir(folder);
dir.setFilter(dir.filter() | QDir::NoDotAndDotDot); dir.setFilter(dir.filter() | QDir::NoDotAndDotDot);
foreach (const QFileInfo &file, dir.entryInfoList()) { foreach (const QFileInfo &file, dir.entryInfoList()) {
if (file.isDir() && !file.isSymLink()) if (file.isDir() && !file.isSymLink())
result += recursiveEnumerate(file.absoluteFilePath()); result += recursiveEnumerate(file.absoluteFilePath());
else if (!Core::EditorManager::isAutoSaveFile(file.fileName())) else if (!Core::EditorManager::isAutoSaveFile(file.fileName()))
result += FileName(file); result += FileName(file);
} }
} else if (fi.exists()) {
result << FileName(fi);
}
return result; return result;
} }