From adf829e65d0837c043dbfdfaba49dd145debe954 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 15 Apr 2020 10:52:51 +0200 Subject: Add a QRegularExpression::fromWildcard() convenience method Simplify constructing QRegularExpression objects from a glob pattern. Change-Id: I06f60b1dfea3da969e2474dedd44b6ca5d456d7d Reviewed-by: Simon Hausmann Reviewed-by: Joerg Bornemann --- src/widgets/dialogs/qfilesystemmodel.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 6afdfa6eb9..30d1324248 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -2148,12 +2148,10 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const // Check the name regularexpression filters if (!(node->isDir() && (filters & QDir::AllDirs))) { - const QRegularExpression::PatternOptions options = - (filters & QDir::CaseSensitive) ? QRegularExpression::NoPatternOption - : QRegularExpression::CaseInsensitiveOption; + auto cs = (filters & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive; for (const auto &nameFilter : nameFilters) { - QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(nameFilter), options); + auto rx = QRegularExpression::fromWildcard(nameFilter, cs); QRegularExpressionMatch match = rx.match(node->fileName); if (match.hasMatch()) return true; -- cgit v1.2.3