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

QDirListing: unexport the class

Browse Source 
This is a non-polymorphic class, so we should export only individual
out-of-line methods.
Same for the nested DirEntry class.

Amends c39a0d1e8956e042139ce3065681e4c5d07412f3.

Found in 6.8 API review.

Change-Id: Ifde785d9ece1641351501159963d8cc065d8e140
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 7394f7151404e0649eb59d8fa84eb7061635ee70)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-08-28 11:18:33 +02:00 committed by Qt Cherry-pick Bot
parent 6dfb013b62
commit 571a4a3efb
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ class QFileInfo;
class QDir; class QDir;
class QTimeZone; class QTimeZone;
class Q_CORE_EXPORT QDirListing class QDirListing
{ {
public: public:
enum class IteratorFlag { enum class IteratorFlag {
@ -40,44 +40,45 @@ public:
}; };
Q_DECLARE_FLAGS(IteratorFlags, IteratorFlag) Q_DECLARE_FLAGS(IteratorFlags, IteratorFlag)
explicit QDirListing(const QString &path, IteratorFlags flags = IteratorFlag::Default); Q_CORE_EXPORT explicit QDirListing(const QString &path,
explicit QDirListing(const QString &path, const QStringList &nameFilters, IteratorFlags flags = IteratorFlag::Default);
IteratorFlags flags = IteratorFlag::Default); Q_CORE_EXPORT explicit QDirListing(const QString &path, const QStringList &nameFilters,
IteratorFlags flags = IteratorFlag::Default);
QDirListing(QDirListing &&); QDirListing(QDirListing &&);
QDirListing &operator=(QDirListing &&); QDirListing &operator=(QDirListing &&);
~QDirListing(); Q_CORE_EXPORT ~QDirListing();
QString iteratorPath() const; Q_CORE_EXPORT QString iteratorPath() const;
IteratorFlags iteratorFlags() const; Q_CORE_EXPORT IteratorFlags iteratorFlags() const;
QStringList nameFilters() const; Q_CORE_EXPORT QStringList nameFilters() const;
class Q_CORE_EXPORT DirEntry class DirEntry
{ {
friend class QDirListing; friend class QDirListing;
QDirListingPrivate *dirListPtr = nullptr; QDirListingPrivate *dirListPtr = nullptr;
public: public:
QString fileName() const; Q_CORE_EXPORT QString fileName() const;
QString baseName() const; Q_CORE_EXPORT QString baseName() const;
QString completeBaseName() const; Q_CORE_EXPORT QString completeBaseName() const;
QString suffix() const; Q_CORE_EXPORT QString suffix() const;
QString bundleName() const; Q_CORE_EXPORT QString bundleName() const;
QString completeSuffix() const; Q_CORE_EXPORT QString completeSuffix() const;
QString filePath() const; Q_CORE_EXPORT QString filePath() const;
bool isDir() const; Q_CORE_EXPORT bool isDir() const;
bool isFile() const; Q_CORE_EXPORT bool isFile() const;
bool isSymLink() const; Q_CORE_EXPORT bool isSymLink() const;
bool exists() const; Q_CORE_EXPORT bool exists() const;
bool isHidden() const; Q_CORE_EXPORT bool isHidden() const;
bool isReadable() const; Q_CORE_EXPORT bool isReadable() const;
bool isWritable() const; Q_CORE_EXPORT bool isWritable() const;
bool isExecutable() const; Q_CORE_EXPORT bool isExecutable() const;
QFileInfo fileInfo() const; Q_CORE_EXPORT QFileInfo fileInfo() const;
QString canonicalFilePath() const; Q_CORE_EXPORT QString canonicalFilePath() const;
QString absoluteFilePath() const; Q_CORE_EXPORT QString absoluteFilePath() const;
QString absolutePath() const; Q_CORE_EXPORT QString absolutePath() const;
qint64 size() const; Q_CORE_EXPORT qint64 size() const;
QDateTime birthTime(const QTimeZone &tz) const QDateTime birthTime(const QTimeZone &tz) const
{ return fileTime(QFileDevice::FileBirthTime, tz); } { return fileTime(QFileDevice::FileBirthTime, tz); }
@ -87,7 +88,7 @@ public:
{ return fileTime(QFileDevice::FileModificationTime, tz); } { return fileTime(QFileDevice::FileModificationTime, tz); }
QDateTime lastRead(const QTimeZone &tz) const QDateTime lastRead(const QTimeZone &tz) const
{ return fileTime(QFileDevice::FileAccessTime, tz); } { return fileTime(QFileDevice::FileAccessTime, tz); }
QDateTime fileTime(QFileDevice::FileTime type, const QTimeZone &tz) const; Q_CORE_EXPORT QDateTime fileTime(QFileDevice::FileTime type, const QTimeZone &tz) const;
}; };
class const_iterator class const_iterator
@ -117,7 +118,7 @@ public:
{ return !(lhs == rhs); } { return !(lhs == rhs); }
}; };
const_iterator begin() const; Q_CORE_EXPORT const_iterator begin() const;
const_iterator cbegin() const { return begin(); } const_iterator cbegin() const { return begin(); }
const_iterator end() const { return {}; } const_iterator end() const { return {}; }
const_iterator cend() const { return end(); } const_iterator cend() const { return end(); }
@ -133,8 +134,8 @@ private:
// `uint` instead of QDir::Filters and QDirIterator::IteratorFlags // `uint` instead of QDir::Filters and QDirIterator::IteratorFlags
// because qdir.h can't be included here; qdiriterator.h can't included // because qdir.h can't be included here; qdiriterator.h can't included
// either, because it includes qdir.h // either, because it includes qdir.h
QDirListing(const QString &path, const QStringList &nameFilters, uint dirFilters, Q_CORE_EXPORT QDirListing(const QString &path, const QStringList &nameFilters, uint dirFilters,
uint qdirIteratorFlags = 0); // QDirIterator::NoIteratorFlags == 0x0 uint qdirIteratorFlags = 0); // QDirIterator::NoIteratorFlags == 0x0
std::unique_ptr<QDirListingPrivate> d; std::unique_ptr<QDirListingPrivate> d;
friend class QDir; friend class QDir;