QDirIterator refactoring

Now that the heavy lifting has been done, we can condense
QDirIteratorPrivate::advance() further. It almost looks nice, even!

Using fileEngineIterators.top() directly in the loop condition allows us
to manipulate the stack without the foundDirectory check. Since QStack
can be inlined, this shouldn't severely affect performance...

Reviewed-by: Marius Storm-Olsen

1 files changed, 7 insertions, 11 deletions

diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index ae5318f..8c7645e 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -183,29 +183,25 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo)
 void QDirIteratorPrivate::advance()
 {
     while (!fileEngineIterators.isEmpty()) {
-        QAbstractFileEngineIterator *it = fileEngineIterators.top();
 
         // Find the next valid iterator that matches the filters.
-        bool foundDirectory = false;
-        while (it->hasNext()) {
+        while (fileEngineIterators.top()->hasNext()) {
+            QAbstractFileEngineIterator *it = fileEngineIterators.top();
             it->next();
+
             const QFileInfo info = it->currentFileInfo();
+            checkAndPushDirectory(it->currentFileInfo());
+
             if (matchesFilters(it->currentFileName(), info)) {
                 currentFileInfo = nextFileInfo;
                 nextFileInfo = info;
 
-                checkAndPushDirectory(nextFileInfo);
-
                 //We found a matching entry.
                 return;
-
-            } else if (checkAndPushDirectory(info)) {
-                foundDirectory = true;
-                break;
             }
         }
-        if (!foundDirectory)
-            delete fileEngineIterators.pop();
+
+        delete fileEngineIterators.pop();
     }
 
     currentFileInfo = nextFileInfo;