AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace QRegExp by QRegularExpression in QFileSystemModel

Browse Source 
[ChangeLog][Widgets][Dialogs] QFileSystemModel now uses
QRegularExpression internally for wildcard matching. Note
that QRegularExpression might not give the exact same
result as QRegExp as its implementation follows strictly
the glob patterns definition for wildcard expressions.

Change-Id: I6ca893833ff7b5b7f678221bb9bc623fd17c1cfa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Samuel Gaist 2018-07-19 00:22:15 +02:00
parent a2c85bffbe
commit 5dd9616f6d
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/widgets/dialogs/qfilesystemmodel.cpp
View File

@ -48,6 +48,9 @@
#endif
#include <qapplication.h>
#include <QtCore/qcollator.h>
#if QT_CONFIG(regularexpression)
# include <QtCore/qregularexpression.h>
#endif
#include <algorithm>
@ -1580,7 +1583,7 @@ bool QFileSystemModel::nameFilterDisables() const
void QFileSystemModel::setNameFilters(const QStringList &filters)
{
// Prep the regexp's ahead of time
#ifndef QT_NO_REGEXP
#if QT_CONFIG(regularexpression)
Q_D(QFileSystemModel);
if (!d->bypassFilters.isEmpty()) {
@ -1601,11 +1604,7 @@ void QFileSystemModel::setNameFilters(const QStringList &filters)
}
}
d->nameFilters.clear();
const Qt::CaseSensitivity caseSensitive =
(filter() & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive;
for (const auto &filter : filters)
d->nameFilters << QRegExp(filter, caseSensitive, QRegExp::Wildcard);
d->nameFilters = filters;
d->forceSort = true;
d->delayedSort();
#endif
@ -1616,16 +1615,12 @@ void QFileSystemModel::setNameFilters(const QStringList &filters)
*/
QStringList QFileSystemModel::nameFilters() const
{
#if QT_CONFIG(regularexpression)
Q_D(const QFileSystemModel);
QStringList filters;
#ifndef QT_NO_REGEXP
const int numNameFilters = d->nameFilters.size();
filters.reserve(numNameFilters);
for (int i = 0; i < numNameFilters; ++i) {
filters << d->nameFilters.at(i).pattern();
}
return d->nameFilters;
#else
return QStringList();
#endif
return filters;
}
/*!
@ -2026,15 +2021,23 @@ bool QFileSystemModelPrivate::filtersAcceptsNode(const QFileSystemNode *node) co
*/
bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
{
#ifndef QT_NO_REGEXP
#if QT_CONFIG(regularexpression)
if (nameFilters.isEmpty())
return true;
// Check the name regularexpression filters
if (!(node->isDir() && (filters & QDir::AllDirs))) {
const QRegularExpression::PatternOptions options =
(filters & QDir::CaseSensitive) ? QRegularExpression::NoPatternOption
: QRegularExpression::CaseInsensitiveOption;
for (const auto &nameFilter : nameFilters) {
QRegExp copy = nameFilter;
if (copy.exactMatch(node->fileName))
const QString wildcard = QLatin1String("\\A(?:")
+ QRegularExpression::wildcardToRegularExpression(nameFilter)
+ QLatin1String(")\\z");
QRegularExpression rx(wildcard, options);
QRegularExpressionMatch match = rx.match(node->fileName);
if (match.hasMatch())
return true;
}
return false;

4
src/widgets/dialogs/qfilesystemmodel_p.h
View File

@ -315,8 +315,8 @@ public:
//It enable a sort which is not recursive, it means
//we sort only what we see.
bool disableRecursiveSort;
#ifndef QT_NO_REGEXP
QList<QRegExp> nameFilters;
#if QT_CONFIG(regularexpression)
QStringList nameFilters;
#endif
QHash<QString, QString> resolvedSymLinks;