1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDirListing: add getters for iterator flags and name filters

Browse Source 
Task-number: QTBUG-125859
Change-Id: I2c60503f37db4668c867760e1fcf061cb4e23faa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit ffc7c4543e6ae3f4c7c520addaa0875e171c2bee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2024-06-01 23:25:10 +03:00 committed by Qt Cherry-pick Bot
parent db480e8cd5
commit 7f3b17b3a6
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/io/qdirlisting.cpp
View File

@ -635,6 +635,23 @@ QString QDirListing::iteratorPath() const
return d->initialEntryInfo.filePath(); return d->initialEntryInfo.filePath();
} }
/*!
Returns the set of IteratorFlags used to construct this QDirListing.
*/
QDirListing::IteratorFlags QDirListing::iteratorFlags() const
{
return d->iteratorFlags;
}
/*!
Returns the list of file name glob filters used to construct this
QDirListing.
*/
QStringList QDirListing::nameFilters() const
{
return d->nameFilters;
}
/*! /*!
\fn QDirListing::const_iterator QDirListing::begin() const \fn QDirListing::const_iterator QDirListing::begin() const
\fn QDirListing::const_iterator QDirListing::cbegin() const \fn QDirListing::const_iterator QDirListing::cbegin() const

2
src/corelib/io/qdirlisting.h
View File

@ -50,6 +50,8 @@ public:
~QDirListing(); ~QDirListing();
QString iteratorPath() const; QString iteratorPath() const;
IteratorFlags iteratorFlags() const;
QStringList nameFilters() const;
class Q_CORE_EXPORT DirEntry class Q_CORE_EXPORT DirEntry
{ {

12
tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
View File

@ -377,9 +377,19 @@ void tst_QDirListing::iterateRelativeDirectory()
QFETCH(QStringList, nameFilters); QFETCH(QStringList, nameFilters);
QFETCH(const QStringList, entries); QFETCH(const QStringList, entries);
const QDirListing lister(dirName, nameFilters, flags);
if (nameFilters.isEmpty() || nameFilters == QStringList("*"_L1))
QVERIFY(lister.nameFilters().isEmpty());
else
QCOMPARE_EQ(lister.nameFilters(), nameFilters);
QCOMPARE(lister.iteratorFlags(), flags);
QCOMPARE(lister.iteratorPath(), dirName);
// If canonicalFilePath is empty (e.g. for broken symlinks), use absoluteFilePath() // If canonicalFilePath is empty (e.g. for broken symlinks), use absoluteFilePath()
QStringList list; QStringList list;
for (const auto &dirEntry : QDirListing(dirName, nameFilters, flags)) { for (const auto &dirEntry : lister) {
QString filePath = dirEntry.canonicalFilePath(); QString filePath = dirEntry.canonicalFilePath();
list.emplace_back(!filePath.isEmpty()? filePath : dirEntry.absoluteFilePath()); list.emplace_back(!filePath.isEmpty()? filePath : dirEntry.absoluteFilePath());
} }