From 0533695dddf9683660ad79383eb2c90532f68acb Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 01:11:51 +0200 Subject: QDir: remove an unneeded QFlags->int conversion Just use the original QFlags. Drive by, use testFlag to check if it contains a given value or not. Change-Id: I4d5e8454df33a3f4727855d55f7587143450dda6 Reviewed-by: Thiago Macieira --- src/corelib/io/qdir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/corelib/io/qdir.cpp') diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index fbf640bb63..c4dbd27aa1 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -242,9 +242,9 @@ struct QDirSortItem class QDirSortItemComparator { - int qt_cmp_si_sort_flags; + QDir::SortFlags qt_cmp_si_sort_flags; public: - QDirSortItemComparator(int flags) : qt_cmp_si_sort_flags(flags) {} + QDirSortItemComparator(QDir::SortFlags flags) : qt_cmp_si_sort_flags(flags) {} bool operator()(const QDirSortItem &, const QDirSortItem &) const; }; @@ -259,8 +259,8 @@ bool QDirSortItemComparator::operator()(const QDirSortItem &n1, const QDirSortIt return !f1->item.isDir(); qint64 r = 0; - int sortBy = (qt_cmp_si_sort_flags & QDir::SortByMask) - | (qt_cmp_si_sort_flags & QDir::Type); + int sortBy = ((qt_cmp_si_sort_flags & QDir::SortByMask) + | (qt_cmp_si_sort_flags & QDir::Type)).toInt(); switch (sortBy) { case QDir::Time: { @@ -282,7 +282,7 @@ bool QDirSortItemComparator::operator()(const QDirSortItem &n1, const QDirSortIt break; case QDir::Type: { - bool ic = qt_cmp_si_sort_flags & QDir::IgnoreCase; + bool ic = qt_cmp_si_sort_flags.testAnyFlag(QDir::IgnoreCase); if (f1->suffix_cache.isNull()) f1->suffix_cache = ic ? f1->item.suffix().toLower() @@ -302,7 +302,7 @@ bool QDirSortItemComparator::operator()(const QDirSortItem &n1, const QDirSortIt if (r == 0 && sortBy != QDir::Unsorted) { // Still not sorted - sort by name - bool ic = qt_cmp_si_sort_flags & QDir::IgnoreCase; + bool ic = qt_cmp_si_sort_flags.testAnyFlag(QDir::IgnoreCase); if (f1->filename_cache.isNull()) f1->filename_cache = ic ? f1->item.fileName().toLower() -- cgit v1.2.3