diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-02 02:34:00 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-17 00:11:28 +0200 |
| commit | fca6021f5b2c5b97b6f9407f04a0f21dac78b11a (patch) | |
| tree | c47ca0629a413aef31f0e5ade5e85fcd3c55b92a /src/corelib/io | |
| parent | 18e6debca70985e7b5fd05d08e58676d50b7d973 (diff) | |
QFileSystemMetaData: code tidies
Turn some implicit conversions into calls to QFlags::testAnyFlag.
In one case, move some code using QFlags operators *after* such
operators have been declared by the right macro.
Change-Id: Ib5713f028ce74d1c9054b87cc12eea5715f2bc94
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index 1445b83ec2..6340e204db 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -193,20 +193,20 @@ public: knownFlagsMask &= ~flags; } - bool exists() const { return (entryFlags & ExistsAttribute); } + bool exists() const { return entryFlags.testAnyFlag(ExistsAttribute); } - bool isLink() const { return (entryFlags & LinkType); } - bool isFile() const { return (entryFlags & FileType); } - bool isDirectory() const { return (entryFlags & DirectoryType); } + bool isLink() const { return entryFlags.testAnyFlag(LinkType); } + bool isFile() const { return entryFlags.testAnyFlag(FileType); } + bool isDirectory() const { return entryFlags.testAnyFlag(DirectoryType); } bool isBundle() const; bool isAlias() const; - bool isLegacyLink() const { return (entryFlags & LegacyLinkType); } - bool isSequential() const { return (entryFlags & SequentialType); } - bool isHidden() const { return (entryFlags & HiddenAttribute); } - bool wasDeleted() const { return (entryFlags & WasDeletedAttribute); } + bool isLegacyLink() const { return entryFlags.testAnyFlag(LegacyLinkType); } + bool isSequential() const { return entryFlags.testAnyFlag(SequentialType); } + bool isHidden() const { return entryFlags.testAnyFlag(HiddenAttribute); } + bool wasDeleted() const { return entryFlags.testAnyFlag(WasDeletedAttribute); } #if defined(Q_OS_WIN) - bool isLnkFile() const { return (entryFlags & WinLnkType); } - bool isJunction() const { return (entryFlags & JunctionType); } + bool isLnkFile() const { return entryFlags.testAnyFlag(WinLnkType); } + bool isJunction() const { return entryFlags.testAnyFlag(JunctionType); } #else bool isLnkFile() const { return false; } bool isJunction() const { return false; } @@ -214,7 +214,7 @@ public: qint64 size() const { return size_; } - QFile::Permissions permissions() const { return QFile::Permissions(Permissions & entryFlags); } + QFile::Permissions permissions() const; QDateTime accessTime() const; QDateTime birthTime() const; @@ -267,9 +267,11 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemMetaData::MetaDataFlags) +inline QFile::Permissions QFileSystemMetaData::permissions() const { return QFile::Permissions::fromInt((Permissions & entryFlags).toInt()); } + #if defined(Q_OS_DARWIN) -inline bool QFileSystemMetaData::isBundle() const { return (entryFlags & BundleType); } -inline bool QFileSystemMetaData::isAlias() const { return (entryFlags & AliasType); } +inline bool QFileSystemMetaData::isBundle() const { return entryFlags.testAnyFlag(BundleType); } +inline bool QFileSystemMetaData::isAlias() const { return entryFlags.testAnyFlag(AliasType); } #else inline bool QFileSystemMetaData::isBundle() const { return false; } inline bool QFileSystemMetaData::isAlias() const { return false; } |