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

QFileSystemMetaData: code tidies

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2021-05-02 02:34:00 +02:00
parent 18e6debca7
commit fca6021f5b
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/io/qfilesystemmetadata_p.h
View File

@ -193,20 +193,20 @@ public:
knownFlagsMask &= ~flags; knownFlagsMask &= ~flags;
} }
bool exists() const { return (entryFlags & ExistsAttribute); } bool exists() const { return entryFlags.testAnyFlag(ExistsAttribute); }
bool isLink() const { return (entryFlags & LinkType); } bool isLink() const { return entryFlags.testAnyFlag(LinkType); }
bool isFile() const { return (entryFlags & FileType); } bool isFile() const { return entryFlags.testAnyFlag(FileType); }
bool isDirectory() const { return (entryFlags & DirectoryType); } bool isDirectory() const { return entryFlags.testAnyFlag(DirectoryType); }
bool isBundle() const; bool isBundle() const;
bool isAlias() const; bool isAlias() const;
bool isLegacyLink() const { return (entryFlags & LegacyLinkType); } bool isLegacyLink() const { return entryFlags.testAnyFlag(LegacyLinkType); }
bool isSequential() const { return (entryFlags & SequentialType); } bool isSequential() const { return entryFlags.testAnyFlag(SequentialType); }
bool isHidden() const { return (entryFlags & HiddenAttribute); } bool isHidden() const { return entryFlags.testAnyFlag(HiddenAttribute); }
bool wasDeleted() const { return (entryFlags & WasDeletedAttribute); } bool wasDeleted() const { return entryFlags.testAnyFlag(WasDeletedAttribute); }
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
bool isLnkFile() const { return (entryFlags & WinLnkType); } bool isLnkFile() const { return entryFlags.testAnyFlag(WinLnkType); }
bool isJunction() const { return (entryFlags & JunctionType); } bool isJunction() const { return entryFlags.testAnyFlag(JunctionType); }
#else #else
bool isLnkFile() const { return false; } bool isLnkFile() const { return false; }
bool isJunction() const { return false; } bool isJunction() const { return false; }
@ -214,7 +214,7 @@ public:
qint64 size() const { return size_; } qint64 size() const { return size_; }
QFile::Permissions permissions() const { return QFile::Permissions(Permissions & entryFlags); } QFile::Permissions permissions() const;
QDateTime accessTime() const; QDateTime accessTime() const;
QDateTime birthTime() const; QDateTime birthTime() const;
@ -267,9 +267,11 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemMetaData::MetaDataFlags) 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) #if defined(Q_OS_DARWIN)
inline bool QFileSystemMetaData::isBundle() const { return (entryFlags & BundleType); } inline bool QFileSystemMetaData::isBundle() const { return entryFlags.testAnyFlag(BundleType); }
inline bool QFileSystemMetaData::isAlias() const { return (entryFlags & AliasType); } inline bool QFileSystemMetaData::isAlias() const { return entryFlags.testAnyFlag(AliasType); }
#else #else
inline bool QFileSystemMetaData::isBundle() const { return false; } inline bool QFileSystemMetaData::isBundle() const { return false; }
inline bool QFileSystemMetaData::isAlias() const { return false; } inline bool QFileSystemMetaData::isAlias() const { return false; }