From 338510af2b2d9746820039c024cc5f1be1b156c9 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Tue, 26 Dec 2023 14:45:10 +0200 Subject: [PATCH] FileIteratorWrapper: simplify constructor The other two parameters, QDir::Filter and nameFilters string list, can be retrieved from the baseIterator. Change-Id: Id33a95f3b490e8f5846e9728fc66da0df5195be9 Reviewed-by: Marcus Tillmanns (cherry picked from commit 2f78fd4358f0126ac25a17ceeff259c7f53db0de) --- src/libs/utils/fsengine/fileiteratordevicesappender.h | 6 ++---- src/libs/utils/fsengine/rootinjectfsengine.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/fsengine/fileiteratordevicesappender.h b/src/libs/utils/fsengine/fileiteratordevicesappender.h index a28f1190806..28c308ddabc 100644 --- a/src/libs/utils/fsengine/fileiteratordevicesappender.h +++ b/src/libs/utils/fsengine/fileiteratordevicesappender.h @@ -36,10 +36,8 @@ class FileIteratorWrapper : public QAbstractFileEngineIterator }; public: - FileIteratorWrapper(std::unique_ptr &&baseIterator, - QDir::Filters filters, - const QStringList &filterNames) - : QAbstractFileEngineIterator(filters, filterNames) + FileIteratorWrapper(std::unique_ptr &&baseIterator) + : QAbstractFileEngineIterator(baseIterator->filters(), baseIterator->nameFilters()) , m_baseIterator(std::move(baseIterator)) {} diff --git a/src/libs/utils/fsengine/rootinjectfsengine.h b/src/libs/utils/fsengine/rootinjectfsengine.h index 6e40f5f742b..d57747dab96 100644 --- a/src/libs/utils/fsengine/rootinjectfsengine.h +++ b/src/libs/utils/fsengine/rootinjectfsengine.h @@ -20,7 +20,7 @@ public: { std::unique_ptr baseIterator( QFSFileEngine::beginEntryList(filters, filterNames)); - return new FileIteratorWrapper(std::move(baseIterator), filters, filterNames); + return new FileIteratorWrapper(std::move(baseIterator)); } };