From 861647e8a5e9985db9da2943e422af4e91de2710 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 02:24:50 +0200 Subject: [PATCH] Item models: code tidies Use QFlags::testAnyFlag instead of relying on implicit conversions. Change-Id: I7ac8149535ad28e47fbf3e250042892bdf8c3a72 Reviewed-by: Christian Ehrlicher Reviewed-by: Samuel Gaist --- src/corelib/itemmodels/qabstractitemmodel.cpp | 4 ++-- src/corelib/itemmodels/qitemselectionmodel.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index ca04eb6a31..8dda51e5f5 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -2535,8 +2535,8 @@ QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role, QModelIndexList result; uint matchType = (flags & Qt::MatchTypeMask).toInt(); Qt::CaseSensitivity cs = flags & Qt::MatchCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; - bool recurse = flags & Qt::MatchRecursive; - bool wrap = flags & Qt::MatchWrap; + bool recurse = flags.testAnyFlag(Qt::MatchRecursive); + bool wrap = flags.testAnyFlag(Qt::MatchWrap); bool allHits = (hits == -1); QString text; // only convert to a string if it is needed #if QT_CONFIG(regularexpression) diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 1b8b8f57ff..4653bd26ba 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -1477,7 +1477,7 @@ bool QItemSelectionModel::isSelected(const QModelIndex &index) const if (selected) { Qt::ItemFlags flags = d->model->flags(index); - return (flags & Qt::ItemIsSelectable); + return flags.testAnyFlag(Qt::ItemIsSelectable); } return false;