diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2023-12-17 21:10:18 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-03-20 21:49:59 +0200 |
commit | ceeaf1b65787d3ef46dd0bdbd0e6810137163fea (patch) | |
tree | 7a3e10733a58f622b79c16d9e87ad3f1b7e17448 /src/corelib/io/qfsfileengine_iterator_p.h | |
parent | cd5dd8b95bbda1e9531af52c251ea926f125c8ea (diff) |
QAbstractFileEngineIterator: add `bool advance()` virtual method
And remove hasNext/next() methods. This remodels QAFEI to be like
QFileSystemIterator. This better fits the logic in the newly added
QDirListing class (which uses STL-style iterators).
QFSFileEngineIterator:
Initialize the internal nativeIterator in the constructor; also replace
the advance() private method with an override for the advance() method
inherited from the base class.
QResourceFileEngineIterator:
Override currentFileInfo(), with a QResouces the QFileInfo is created
on demand if/when this method is called.
This is the backend/private API, and QDirListing is the public API that
can be used in a ranged-for to iterate over directory entries.
Change-Id: I93eb7bdd64823ac01eea2dcaaa6bcc8ad868b2c4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/io/qfsfileengine_iterator_p.h')
-rw-r--r-- | src/corelib/io/qfsfileengine_iterator_p.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h index 4ad1bb0350..b91c5d9973 100644 --- a/src/corelib/io/qfsfileengine_iterator_p.h +++ b/src/corelib/io/qfsfileengine_iterator_p.h @@ -29,18 +29,13 @@ public: QFSFileEngineIterator(const QString &path, QDir::Filters filters, const QStringList &filterNames); ~QFSFileEngineIterator(); - QString next() override; - bool hasNext() const override; + bool advance() override; QString currentFileName() const override; QFileInfo currentFileInfo() const override; private: - void advance() const; mutable QScopedPointer<QFileSystemIterator> nativeIterator; - mutable QFileInfo currentInfo; - mutable QFileInfo nextInfo; - mutable bool done; }; QT_END_NAMESPACE |