From b8ea6e8f0e083d234c092f46dbffc220d5448949 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Oct 2016 15:27:51 +0200 Subject: [PATCH] remove redundancy from QmakePriFileNode::recursiveEnumerate() we *know* that this function is called only with folders; it's part of its api. Change-Id: Idada1e6672a916c0d550d191770396ebbc54b02f Reviewed-by: Tobias Hunger --- .../qmakeprojectmanager/qmakenodes.cpp | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 3c7a752aa14..e194c73882e 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -622,19 +622,13 @@ QStringList QmakePriFileNode::fullVPaths(const QStringList &baseVPaths, QtSuppor QSet QmakePriFileNode::recursiveEnumerate(const QString &folder) { QSet result; - QFileInfo fi(folder); - if (fi.isDir()) { - QDir dir(folder); - dir.setFilter(dir.filter() | QDir::NoDotAndDotDot); - - foreach (const QFileInfo &file, dir.entryInfoList()) { - if (file.isDir() && !file.isSymLink()) - result += recursiveEnumerate(file.absoluteFilePath()); - else if (!Core::EditorManager::isAutoSaveFile(file.fileName())) - result += FileName(file); - } - } else if (fi.exists()) { - result << FileName(fi); + QDir dir(folder); + dir.setFilter(dir.filter() | QDir::NoDotAndDotDot); + foreach (const QFileInfo &file, dir.entryInfoList()) { + if (file.isDir() && !file.isSymLink()) + result += recursiveEnumerate(file.absoluteFilePath()); + else if (!Core::EditorManager::isAutoSaveFile(file.fileName())) + result += FileName(file); } return result; }