From 2f725cd559355982337a989419bb13bf1664d9e6 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Wed, 6 Mar 2024 20:20:28 +0200
Subject: [PATCH] FileIteratorWrapper: simplify the code

Setting m_status to BaseIteratorEnd should only be done in hasNext(),
because the latter is always called first, before any other member
function.

Change-Id: Ie55518a850655730fb760226d58c4fb171a7f2e1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
(cherry picked from commit 1ddc71fcda9c3e368c9edc936efb99b0641f145b)
---
 .../fsengine/fileiteratordevicesappender.h    | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/libs/utils/fsengine/fileiteratordevicesappender.h b/src/libs/utils/fsengine/fileiteratordevicesappender.h
index 0ce327690f2..e2afcf50fe7 100644
--- a/src/libs/utils/fsengine/fileiteratordevicesappender.h
+++ b/src/libs/utils/fsengine/fileiteratordevicesappender.h
@@ -47,8 +47,6 @@ public:
         if (m_status == State::Ended)
             return QString();
 
-        checkStatus();
-
         if (m_status == State::BaseIteratorEnd) {
             m_status = State::Ended;
             return FilePath::specialRootName();
@@ -62,27 +60,26 @@ public:
             return false;
 
         setPath();
-        checkStatus();
 
-        if (m_status == State::BaseIteratorEnd)
+        const bool res = m_baseIterator->hasNext();
+        if (m_status == State::IteratingRoot && !res) {
+            // m_baseIterator finished, but we need to advance one last time, so that
+            // e.g. next() and currentFileName() return FilePath::specialRootPath().
+            m_status = State::BaseIteratorEnd;
             return true;
+        }
 
-        return m_baseIterator->hasNext();
+        return res;
     }
     QString currentFileName() const override
     {
-        if (m_status == State::Ended)
-            return FilePath::specialRootPath();
-
-        checkStatus();
-        return m_baseIterator->currentFileName();
+        return m_status == State::Ended ? FilePath::specialRootPath()
+                                        : m_baseIterator->currentFileName();
     }
     QFileInfo currentFileInfo() const override
     {
-        if (m_status == State::Ended)
-            return QFileInfo(FilePath::specialRootPath());
-        checkStatus();
-        return m_baseIterator->currentFileInfo();
+        return m_status == State::Ended ? QFileInfo(FilePath::specialRootPath())
+                                        : m_baseIterator->currentFileInfo();
     }
 
 private:
@@ -106,15 +103,6 @@ private:
         }
     }
 
-    void checkStatus() const
-    {
-        if (m_status == State::IteratingRoot) {
-            if (m_baseIterator->hasNext() == false) {
-                m_status = State::BaseIteratorEnd;
-            }
-        }
-    }
-
 private:
     std::unique_ptr<QAbstractFileEngineIterator> m_baseIterator;
     mutable bool m_hasSetPath{false};