diff options
Diffstat (limited to 'src/corelib/io/qfsfileengine_iterator.cpp')
-rw-r--r-- | src/corelib/io/qfsfileengine_iterator.cpp | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp index 7f43579a8f..fb0332f7f3 100644 --- a/src/corelib/io/qfsfileengine_iterator.cpp +++ b/src/corelib/io/qfsfileengine_iterator.cpp @@ -9,9 +9,10 @@ QT_BEGIN_NAMESPACE -QFSFileEngineIterator::QFSFileEngineIterator(QDir::Filters filters, const QStringList &filterNames) - : QAbstractFileEngineIterator(filters, filterNames) - , done(false) +QFSFileEngineIterator::QFSFileEngineIterator(const QString &path, QDir::Filters filters, + const QStringList &filterNames) + : QAbstractFileEngineIterator(path, filters, filterNames), + nativeIterator(new QFileSystemIterator(QFileSystemEntry(path), filters)) { } @@ -19,48 +20,30 @@ QFSFileEngineIterator::~QFSFileEngineIterator() { } -bool QFSFileEngineIterator::hasNext() const +bool QFSFileEngineIterator::advance() { - if (!done && !nativeIterator) { - nativeIterator.reset(new QFileSystemIterator(QFileSystemEntry(path()), - filters(), nameFilters())); - advance(); - } - - return !done; -} - -QString QFSFileEngineIterator::next() -{ - if (!hasNext()) - return QString(); - - advance(); - return currentFilePath(); -} - -void QFSFileEngineIterator::advance() const -{ - currentInfo = nextInfo; + if (!nativeIterator) + return false; QFileSystemEntry entry; QFileSystemMetaData data; if (nativeIterator->advance(entry, data)) { - nextInfo = QFileInfo(new QFileInfoPrivate(entry, data)); + m_fileInfo = QFileInfo(new QFileInfoPrivate(entry, data)); + return true; } else { - done = true; nativeIterator.reset(); + return false; } } QString QFSFileEngineIterator::currentFileName() const { - return currentInfo.fileName(); + return m_fileInfo.fileName(); } QFileInfo QFSFileEngineIterator::currentFileInfo() const { - return currentInfo; + return m_fileInfo; } QT_END_NAMESPACE |