diff options
Diffstat (limited to 'src/corelib/io/qfilesystemmetadata_p.h')
-rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 55 |
1 files changed, 38 insertions, 17 deletions
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index 4be95faa1c..c10b66afaf 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -18,6 +18,7 @@ #include "qplatformdefs.h" #include <QtCore/qglobal.h> #include <QtCore/qdatetime.h> +#include <QtCore/qtimezone.h> #include <QtCore/private/qabstractfileengine_p.h> // Platform-specific includes @@ -185,11 +186,15 @@ public: QDateTime metadataChangeTime() const; QDateTime modificationTime() const; - QDateTime fileTime(QAbstractFileEngine::FileTime time) const; + QDateTime fileTime(QFile::FileTime time) const; uint userId() const; uint groupId() const; uint ownerId(QAbstractFileEngine::FileOwner owner) const; + bool isReadable() const { return permissions().testAnyFlags(QFile::ReadUser); } + bool isWritable() const { return permissions().testAnyFlags(QFile::WriteUser); } + bool isExecutable() const { return permissions().testAnyFlags(QFile::ExeUser); } + #ifdef Q_OS_UNIX void fillFromStatxBuf(const struct statx &statBuffer); void fillFromStatBuf(const QT_STATBUF &statBuffer); @@ -207,7 +212,7 @@ private: MetaDataFlags knownFlagsMask; MetaDataFlags entryFlags; - qint64 size_; + qint64 size_ = 0; // Platform-specific data goes here: #if defined(Q_OS_WIN) @@ -218,13 +223,13 @@ private: FILETIME lastWriteTime_; #else // msec precision - qint64 accessTime_; - qint64 birthTime_; - qint64 metadataChangeTime_; - qint64 modificationTime_; + qint64 accessTime_ = 0; + qint64 birthTime_ = 0; + qint64 metadataChangeTime_ = 0; + qint64 modificationTime_ = 0; - uint userId_; - uint groupId_; + uint userId_ = (uint) -2; + uint groupId_ = (uint) -2; #endif }; @@ -242,19 +247,19 @@ inline bool QFileSystemMetaData::isAlias() const { return fal #endif #if defined(Q_OS_UNIX) || defined (Q_OS_WIN) -inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime time) const +inline QDateTime QFileSystemMetaData::fileTime(QFile::FileTime time) const { switch (time) { - case QAbstractFileEngine::ModificationTime: + case QFile::FileModificationTime: return modificationTime(); - case QAbstractFileEngine::AccessTime: + case QFile::FileAccessTime: return accessTime(); - case QAbstractFileEngine::BirthTime: + case QFile::FileBirthTime: return birthTime(); - case QAbstractFileEngine::MetadataChangeTime: + case QFile::FileMetadataChangeTime: return metadataChangeTime(); } @@ -264,13 +269,29 @@ inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime tim #if defined(Q_OS_UNIX) inline QDateTime QFileSystemMetaData::birthTime() const -{ return birthTime_ ? QDateTime::fromMSecsSinceEpoch(birthTime_, Qt::UTC) : QDateTime(); } +{ + return birthTime_ + ? QDateTime::fromMSecsSinceEpoch(birthTime_, QTimeZone::UTC) + : QDateTime(); +} inline QDateTime QFileSystemMetaData::metadataChangeTime() const -{ return metadataChangeTime_ ? QDateTime::fromMSecsSinceEpoch(metadataChangeTime_, Qt::UTC) : QDateTime(); } +{ + return metadataChangeTime_ + ? QDateTime::fromMSecsSinceEpoch(metadataChangeTime_, QTimeZone::UTC) + : QDateTime(); +} inline QDateTime QFileSystemMetaData::modificationTime() const -{ return modificationTime_ ? QDateTime::fromMSecsSinceEpoch(modificationTime_, Qt::UTC) : QDateTime(); } +{ + return modificationTime_ + ? QDateTime::fromMSecsSinceEpoch(modificationTime_, QTimeZone::UTC) + : QDateTime(); +} inline QDateTime QFileSystemMetaData::accessTime() const -{ return accessTime_ ? QDateTime::fromMSecsSinceEpoch(accessTime_, Qt::UTC) : QDateTime(); } +{ + return accessTime_ + ? QDateTime::fromMSecsSinceEpoch(accessTime_, QTimeZone::UTC) + : QDateTime(); +} inline uint QFileSystemMetaData::userId() const { return userId_; } inline uint QFileSystemMetaData::groupId() const { return groupId_; } |