From 4fecfcc867f8215defaa40b50f0340654a36b4c7 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 11 Sep 2024 17:03:28 +0300 Subject: QAbstractFileEngine: remove beginEntryList(QDir::Filters) It was kept so as not to break compilation of user code (overriding a function that doesn't exist in the base class). But as Marcus Tillmanns pointed out in a qtcreator code review, it can't work because QDirListing calls the virutal engine->beginEntryList(QDirListing::IteratorFlags). Removing beginEntryList(QDir::Filters) and getting a compile-timer error is better than the code failing silently in user code (all sub-classes of QAbstractFileEngine in qtbase have been already ported). QDir::entryList() isn't affected because it calls QAbstractFileEngine::entryList() which has an overload that works with QDir::Filters. Pick-to: 6.8 Change-Id: I3cb18402f602ac78a6b29be57e59febb2b9db7c0 Reviewed-by: Thiago Macieira --- src/corelib/io/qresource.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/corelib/io/qresource.cpp') diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index bd208896861..eb82b7fd0e9 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1585,13 +1585,6 @@ QDateTime QResourceFileEngine::fileTime(QFile::FileTime time) const /*! \internal */ -QAbstractFileEngine::IteratorUniquePtr -QResourceFileEngine::beginEntryList(const QString &path, QDir::Filters filters, - const QStringList &filterNames) -{ - return std::make_unique(path, filters, filterNames); -} - QAbstractFileEngine::IteratorUniquePtr QResourceFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) -- cgit v1.2.3