diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2023-12-17 18:29:00 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-03-03 20:28:54 +0200 |
commit | e9126fd3abd00ce38d491da3f8fef61c02620996 (patch) | |
tree | 4b31709fbbfdb69364e3de2976ab8f1982a46dc0 /src/corelib/io/qabstractfileengine.cpp | |
parent | 94dfcaac8aac3b8e49f537f4051a032f6faccb27 (diff) |
QAbstractFileEngineIterator: general code cleanup
- This is private API, no point having the d-pointer indirection; store
the members in QAbstractFileEngineIterator directly. In subsequent
commits sub-classes can use m_fileInfo from the base class, saving
some space in e.g. QFSFileEngineIterator
- Make setPath() public, it's a setter called by some QAFEI sub-classes
- Remove EntryInfoType enum, nothing uses it
This is a step towards remodeling QAFEIterator, and its subclasses,
after QFileSystemIterator, i.e. adding a `virtual bool advance()`
method, and dropping next()/hasNext(). This also is more inline with the
QDirListing class (which uses STL-style iterators).
Change-Id: I8ad774b854231e3cdce4935f04c8bf24031001dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qabstractfileengine.cpp')
-rw-r--r-- | src/corelib/io/qabstractfileengine.cpp | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index c9b792c5d2..08692c394c 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -871,39 +871,21 @@ bool QAbstractFileEngine::cloneTo(QAbstractFileEngine *target) */ /*! - \enum QAbstractFileEngineIterator::EntryInfoType - \internal - - This enum describes the different types of information that can be - requested through the QAbstractFileEngineIterator::entryInfo() function. -*/ - -/*! \typedef QAbstractFileEngine::Iterator \since 4.3 Synonym for QAbstractFileEngineIterator. */ -class QAbstractFileEngineIteratorPrivate -{ -public: - QString path; - QDir::Filters filters; - QStringList nameFilters; - QFileInfo fileInfo; -}; - /*! Constructs a QAbstractFileEngineIterator, using the entry filters \a filters, and wildcard name filters \a nameFilters. */ QAbstractFileEngineIterator::QAbstractFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters) - : d(new QAbstractFileEngineIteratorPrivate) + : m_filters(filters), + m_nameFilters(nameFilters) { - d->nameFilters = nameFilters; - d->filters = filters; } /*! @@ -926,7 +908,7 @@ QAbstractFileEngineIterator::~QAbstractFileEngineIterator() */ QString QAbstractFileEngineIterator::path() const { - return d->path; + return m_path; } /*! @@ -937,7 +919,7 @@ QString QAbstractFileEngineIterator::path() const */ void QAbstractFileEngineIterator::setPath(const QString &path) { - d->path = path; + m_path = path; } /*! @@ -947,7 +929,7 @@ void QAbstractFileEngineIterator::setPath(const QString &path) */ QStringList QAbstractFileEngineIterator::nameFilters() const { - return d->nameFilters; + return m_nameFilters; } /*! @@ -957,7 +939,7 @@ QStringList QAbstractFileEngineIterator::nameFilters() const */ QDir::Filters QAbstractFileEngineIterator::filters() const { - return d->filters; + return m_filters; } /*! @@ -1001,26 +983,11 @@ QString QAbstractFileEngineIterator::currentFilePath() const QFileInfo QAbstractFileEngineIterator::currentFileInfo() const { QString path = currentFilePath(); - if (d->fileInfo.filePath() != path) - d->fileInfo.setFile(path); + if (m_fileInfo.filePath() != path) + m_fileInfo.setFile(path); // return a shallow copy - return d->fileInfo; -} - -/*! - \internal - - Returns the entry info \a type for this iterator's current directory entry - as a QVariant. If \a type is undefined for this entry, a null QVariant is - returned. - - \sa QAbstractFileEngine::beginEntryList(), QDir::beginEntryList() -*/ -QVariant QAbstractFileEngineIterator::entryInfo(EntryInfoType type) const -{ - Q_UNUSED(type); - return QVariant(); + return m_fileInfo; } /*! |