diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2024-06-21 00:59:45 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-06-27 03:35:02 +0300 |
| commit | e583c3d5163a5512abac85e32359652e28a053f7 (patch) | |
| tree | a8cb9487210cc084614923d82a1c318d255a3291 /src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | |
| parent | 05d4740623477eda83c1ce544aeadffba3014806 (diff) | |
QDirListing: add flags to handle entries filtering
By extending IteratorFlag so that it replaces both QDir::Filter and
QDirIterator::IteratorFlag enums, but with better defaults (based on how
QDir/Iterator is used in 15-20 years worth of code in Qt and KDE).
Make the QDirListing(QDir ~~) ctor private, also change it to use
QDirIterator::IteratatorFlags; it will be used to port existing code.
If QDir is ported to use QDirListing::IteratorFlags, instead of
QDir::Filters, a public QDirListing(QDir) constructor can then be added.
Pick-to: 6.8
Fixes: QTBUG-125504
Task-number: QTBUG-125859
Change-Id: Ide4ff8279f554029ac30d0579b0e8373ed4337f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 4ea6536cef2..1c7364cd229 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -164,7 +164,7 @@ Q_CONSTINIT QMutex FolderIterator::m_assetsCacheMutex; class AndroidAbstractFileEngineIterator: public QAbstractFileEngineIterator { public: - AndroidAbstractFileEngineIterator(QDir::Filters filters, + AndroidAbstractFileEngineIterator(QDirListing::IteratorFlags filters, const QStringList &nameFilters, const QString &path) : QAbstractFileEngineIterator(path, filters, nameFilters) @@ -351,8 +351,8 @@ public: m_assetsInfoCache.insert(m_fileName, newAssetInfoPtr); } - IteratorUniquePtr - beginEntryList(const QString &, QDir::Filters filters, const QStringList &filterNames) override + IteratorUniquePtr beginEntryList(const QString &, QDirListing::IteratorFlags filters, + const QStringList &filterNames) override { // AndroidAbstractFileEngineIterator use `m_fileName` as the path if (m_assetInfo && m_assetInfo->type == AssetItem::Type::Folder) |