diff options
Diffstat (limited to 'src/corelib/io/qabstractfileengine_p.h')
-rw-r--r-- | src/corelib/io/qabstractfileengine_p.h | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 28f07bf8f9..b2e0b248da 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -19,6 +19,7 @@ #include "QtCore/qfile.h" #include "QtCore/qdir.h" +#include <memory> #include <optional> #ifdef open @@ -80,12 +81,7 @@ public: OwnerUser, OwnerGroup }; - enum FileTime { - AccessTime, - BirthTime, - MetadataChangeTime, - ModificationTime - }; + virtual ~QAbstractFileEngine(); @@ -116,8 +112,8 @@ public: virtual QString fileName(FileName file=DefaultName) const; virtual uint ownerId(FileOwner) const; virtual QString owner(FileOwner) const; - virtual bool setFileTime(const QDateTime &newDate, FileTime time); - virtual QDateTime fileTime(FileTime time) const; + virtual bool setFileTime(const QDateTime &newDate, QFile::FileTime time); + virtual QDateTime fileTime(QFile::FileTime time) const; virtual void setFileName(const QString &file); virtual int handle() const; virtual bool cloneTo(QAbstractFileEngine *target); @@ -126,8 +122,11 @@ public: bool unmap(uchar *ptr); typedef QAbstractFileEngineIterator Iterator; - virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); - virtual Iterator *endEntryList(); + using IteratorUniquePtr = std::unique_ptr<Iterator>; + + virtual IteratorUniquePtr + beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames); + virtual IteratorUniquePtr endEntryList() { return {}; } virtual qint64 read(char *data, qint64 maxlen); virtual qint64 readLine(char *data, qint64 maxlen); @@ -148,26 +147,33 @@ public: {}; class MapExtensionOption : public ExtensionOption { + Q_DISABLE_COPY_MOVE(MapExtensionOption) public: qint64 offset; qint64 size; QFile::MemoryMapFlags flags; + constexpr MapExtensionOption(qint64 off, qint64 sz, QFile::MemoryMapFlags f) + : offset(off), size(sz), flags(f) {} }; class MapExtensionReturn : public ExtensionReturn { + Q_DISABLE_COPY_MOVE(MapExtensionReturn) public: - uchar *address; + MapExtensionReturn() = default; + uchar *address = nullptr; }; class UnMapExtensionOption : public ExtensionOption { + Q_DISABLE_COPY_MOVE(UnMapExtensionOption) public: - uchar *address; + uchar *address = nullptr; + constexpr UnMapExtensionOption(uchar *p) : address(p) {} }; virtual bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr); virtual bool supportsExtension(Extension extension) const; // Factory - static QAbstractFileEngine *create(const QString &fileName); + static std::unique_ptr<QAbstractFileEngine> create(const QString &fileName); protected: void setError(QFile::FileError error, const QString &str); @@ -185,21 +191,21 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractFileEngine::FileFlags) class Q_CORE_EXPORT QAbstractFileEngineHandler { + Q_DISABLE_COPY_MOVE(QAbstractFileEngineHandler) public: QAbstractFileEngineHandler(); virtual ~QAbstractFileEngineHandler(); - virtual QAbstractFileEngine *create(const QString &fileName) const = 0; + virtual std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const = 0; }; -class QAbstractFileEngineIteratorPrivate; class Q_CORE_EXPORT QAbstractFileEngineIterator { public: - QAbstractFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters); + QAbstractFileEngineIterator(const QString &path, QDir::Filters filters, + const QStringList &nameFilters); virtual ~QAbstractFileEngineIterator(); - virtual QString next() = 0; - virtual bool hasNext() const = 0; + virtual bool advance() = 0; QString path() const; QStringList nameFilters() const; @@ -210,16 +216,17 @@ public: virtual QString currentFilePath() const; protected: - enum EntryInfoType { - }; - virtual QVariant entryInfo(EntryInfoType type) const; + mutable QFileInfo m_fileInfo; private: Q_DISABLE_COPY_MOVE(QAbstractFileEngineIterator) friend class QDirIterator; friend class QDirIteratorPrivate; - void setPath(const QString &path); - QScopedPointer<QAbstractFileEngineIteratorPrivate> d; + friend class QDirListingPrivate; + + QDir::Filters m_filters; + QStringList m_nameFilters; + QString m_path; }; class QAbstractFileEnginePrivate @@ -238,7 +245,7 @@ public: Q_DECLARE_PUBLIC(QAbstractFileEngine) }; -QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &path); +std::unique_ptr<QAbstractFileEngine> qt_custom_file_engine_handler_create(const QString &path); QT_END_NAMESPACE |