whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Ahmad Samir 2024-01-28 23:27:49 +02:00
parent 0516d48ae9
commit e26fbd59d5
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qdiriterator.cpp
View File

@ -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

4
src/corelib/io/qfilesystemiterator_p.h
View File

@ -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);

5
src/corelib/io/qfilesystemiterator_unix.cpp
View File

@ -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) {

5
src/corelib/io/qfilesystemiterator_win.cpp
View File

@ -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);

3
src/corelib/io/qfsfileengine_iterator.cpp
View File

@ -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();
}