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

QDir(Iterator): code tidies

Browse Source 
* Turn some `flags & bit` statements that rely on QFlags->int->bool
implicit conversions, into some more idiomatic `return
flags.testAnyFlag(bit)`. This is in preparation for a future patch, and
to avoid inserting casts (return statements do not contextually convert
to bool).

* Remove a magic constant, replacing it by the symbolic one.

Change-Id: I62fc2b2bf6f0ab8fad121edd19cb2ea0d9e3582a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2021-05-02 02:19:56 +02:00
parent 4d24fcd3e1
commit 5f29ed0d5c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/io/qdir.cpp
View File

@ -159,7 +159,7 @@ bool QDirPrivate::exists() const
| QAbstractFileEngine::Refresh);
if (!(info & QAbstractFileEngine::DirectoryType))
return false;
return info & QAbstractFileEngine::ExistsFlag;
return info.testAnyFlag(QAbstractFileEngine::ExistsFlag);
}
// static
@ -1647,7 +1647,7 @@ bool QDir::isReadable() const
if (!d->metaData.hasFlags(QFileSystemMetaData::UserReadPermission))
QFileSystemEngine::fillMetaData(d->dirEntry, d->metaData, QFileSystemMetaData::UserReadPermission);
return (d->metaData.permissions() & QFile::ReadUser) != 0;
return d->metaData.permissions().testAnyFlag(QFile::ReadUser);
}
const QAbstractFileEngine::FileFlags info =
@ -1655,7 +1655,7 @@ bool QDir::isReadable() const
| QAbstractFileEngine::PermsMask);
if (!(info & QAbstractFileEngine::DirectoryType))
return false;
return info & QAbstractFileEngine::ReadUserPerm;
return info.testAnyFlag(QAbstractFileEngine::ReadUserPerm);
}
/*!
@ -1690,7 +1690,7 @@ bool QDir::isRoot() const
{
if (!d_ptr->fileEngine)
return d_ptr->dirEntry.isRoot();
return d_ptr->fileEngine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::RootFlag;
return d_ptr->fileEngine->fileFlags(QAbstractFileEngine::FlagsMask).testAnyFlag(QAbstractFileEngine::RootFlag);
}
/*!
@ -2157,8 +2157,8 @@ bool QDir::match(const QString &filter, const QString &fileName)
*/
QString qt_normalizePathSegments(const QString &name, QDirPrivate::PathNormalizations flags, bool *ok)
{
const bool allowUncPaths = QDirPrivate::AllowUncPaths & flags;
const bool isRemote = QDirPrivate::RemotePath & flags;
const bool allowUncPaths = flags.testAnyFlag(QDirPrivate::AllowUncPaths);
const bool isRemote = flags.testAnyFlag(QDirPrivate::RemotePath);
const int len = name.length();
if (ok)
@ -2484,10 +2484,10 @@ static QDebug operator<<(QDebug debug, QDir::SortFlags sorting)
debug << "QDir::SortFlags(NoSort)";
} else {
QString type;
if ((sorting & 3) == QDir::Name) type = QLatin1String("Name");
if ((sorting & 3) == QDir::Time) type = QLatin1String("Time");
if ((sorting & 3) == QDir::Size) type = QLatin1String("Size");
if ((sorting & 3) == QDir::Unsorted) type = QLatin1String("Unsorted");
if ((sorting & QDir::SortByMask) == QDir::Name) type = QLatin1String("Name");
if ((sorting & QDir::SortByMask) == QDir::Time) type = QLatin1String("Time");
if ((sorting & QDir::SortByMask) == QDir::Size) type = QLatin1String("Size");
if ((sorting & QDir::SortByMask) == QDir::Unsorted) type = QLatin1String("Unsorted");
QStringList flags;
if (sorting & QDir::DirsFirst) flags << QLatin1String("DirsFirst");

6
src/corelib/io/qdiriterator.cpp
View File

@ -353,8 +353,8 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
}
#endif
// skip symlinks
const bool skipSymlinks = (filters & QDir::NoSymLinks);
const bool includeSystem = (filters & QDir::System);
const bool skipSymlinks = filters.testAnyFlag(QDir::NoSymLinks);
const bool includeSystem = filters.testAnyFlag(QDir::System);
if (skipSymlinks && fi.isSymLink()) {
// The only reason to save this file is if it is a broken link and we are requesting system files.
if (!includeSystem || fi.exists())
@ -362,7 +362,7 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
}
// filter hidden
const bool includeHidden = (filters & QDir::Hidden);
const bool includeHidden = filters.testAnyFlag(QDir::Hidden);
if (!includeHidden && !dotOrDotDot && fi.isHidden())
return false;