diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-08-30 16:08:07 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-12-09 16:16:48 +0100 |
| commit | 3f282e8896980822b86bc009f85bf047c7d9c189 (patch) | |
| tree | 60e5632b1bb5a02fbe94e69eb5e53250904fe6d3 /src/corelib/io/qfilesystemmetadata_p.h | |
| parent | e71099989ebde3156c23066ff2d79ae63c08ccc4 (diff) | |
Adapt corelib to use QTimeZone in place of Qt::TimeSpec
This saves (mostly in corelib/time/) some complications that used to
arise from needing different code-paths for different time-specs.
Task-number: QTBUG-108199
Change-Id: I5dbd09859fce7599f1ba761f8a0bfc4633d0bef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfilesystemmetadata_p.h')
| -rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index 986ec5ca68..cb19b98c33 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 @@ -264,13 +265,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_; } |