diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2024-01-28 23:27:49 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-02-03 00:12:00 +0200 |
commit | e26fbd59d5bf6b5ea14584940ee9351f81183d69 (patch) | |
tree | f92b4edf867e7598d22144726b2cd5ee085e055b | |
parent | 0516d48ae9538d7c51e270f1b90d601d437dc060 (diff) |
QFileSystemIterator: simplify the constructor
Neither implementation (Unix and Windows) uses the QStringList
or the QDir::Filters args.
Change-Id: I6a552e41eb37e4b76246e35d43ac4d34a4ae9d12
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/io/qdiriterator.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemiterator_p.h | 4 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemiterator_unix.cpp | 5 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemiterator_win.cpp | 5 | ||||
-rw-r--r-- | src/corelib/io/qfsfileengine_iterator.cpp | 3 |
5 files changed, 5 insertions, 14 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index e2b9b57374..aa725d03dd 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -171,7 +171,7 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo) } else { #ifndef QT_NO_FILESYSTEMITERATOR nativeIterators.emplace(std::make_unique<QFileSystemIterator>( - fileInfo.d_ptr->fileEntry, filters, nameFilters, iteratorFlags)); + fileInfo.d_ptr->fileEntry, filters)); #else qWarning("Qt was built with -no-feature-filesystemiterator: no files/plugins will be found!"); #endif diff --git a/src/corelib/io/qfilesystemiterator_p.h b/src/corelib/io/qfilesystemiterator_p.h index 29d000261c..6638016a41 100644 --- a/src/corelib/io/qfilesystemiterator_p.h +++ b/src/corelib/io/qfilesystemiterator_p.h @@ -33,9 +33,7 @@ QT_BEGIN_NAMESPACE class QFileSystemIterator { public: - QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters, - const QStringList &nameFilters, QDirIterator::IteratorFlags flags - = QDirIterator::FollowSymlinks | QDirIterator::Subdirectories); + QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters); ~QFileSystemIterator(); bool advance(QFileSystemEntry &fileEntry, QFileSystemMetaData &metaData); diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp index 96ded99a8b..cd8d9400cc 100644 --- a/src/corelib/io/qfilesystemiterator_unix.cpp +++ b/src/corelib/io/qfilesystemiterator_unix.cpp @@ -27,13 +27,10 @@ static bool checkNameDecodable(const char *d_name, qsizetype len) Native filesystem iterator, which uses ::opendir()/readdir()/dirent from the system libraries to iterate over the directory represented by \a entry. */ -QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters, - const QStringList &nameFilters, QDirIterator::IteratorFlags flags) +QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters) : nativePath(entry.nativeFilePath()) { Q_UNUSED(filters); - Q_UNUSED(nameFilters); - Q_UNUSED(flags); dir.reset(QT_OPENDIR(entry.nativeFilePath().constData())); if (!dir) { diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 2c16cc7f6b..30c39f6b4d 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -14,8 +14,7 @@ using namespace Qt::StringLiterals; bool done = true; -QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters, - const QStringList &nameFilters, QDirIterator::IteratorFlags flags) +QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters) : nativePath(entry.nativeFilePath()) , dirPath(entry.filePath()) , findFileHandle(INVALID_HANDLE_VALUE) @@ -23,8 +22,6 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi , uncShareIndex(0) , onlyDirs(false) { - Q_UNUSED(nameFilters); - Q_UNUSED(flags); if (nativePath.endsWith(u".lnk"_s) && !QFileSystemEngine::isDirPath(dirPath, nullptr)) { QFileSystemMetaData metaData; QFileSystemEntry link = QFileSystemEngine::getLinkTarget(entry, metaData); diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp index 7f43579a8f..d6c9320ce0 100644 --- a/src/corelib/io/qfsfileengine_iterator.cpp +++ b/src/corelib/io/qfsfileengine_iterator.cpp @@ -22,8 +22,7 @@ QFSFileEngineIterator::~QFSFileEngineIterator() bool QFSFileEngineIterator::hasNext() const { if (!done && !nativeIterator) { - nativeIterator.reset(new QFileSystemIterator(QFileSystemEntry(path()), - filters(), nameFilters())); + nativeIterator.reset(new QFileSystemIterator(QFileSystemEntry(path()), filters())); advance(); } |