From 89f38b68c3a0c4a85b755006bf602d76fdc37875 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 27 Oct 2020 18:39:24 +0000 Subject: ported all remaining code to QRegularExpression git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9532 90c681e8-e032-0410-971d-27865f9a5e38 --- .../FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp') diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index 6e4cd08d9..e54e35968 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #define HISTORY_SIZE 8 @@ -48,11 +49,11 @@ const char *qt_file_dialog_filter_reg_exp = // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)" static QStringList qt_clean_filter_list(const QString &filter) { - QRegExp regexp(QString::fromLatin1(qt_file_dialog_filter_reg_exp)); + QRegularExpression regexp(QString::fromLatin1(qt_file_dialog_filter_reg_exp)); QString f = filter; - int i = regexp.indexIn(f); - if (i >= 0) - f = regexp.cap(2); + QRegularExpressionMatch match = regexp.match(f); + if (match.hasMatch()) + f = match.captured(2); return f.split(QLatin1Char(' '), QString::SkipEmptyParts); } @@ -447,8 +448,7 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list) bool contains = false; for(const QString &str : qt_clean_filter_list(fileTypeComboBox->currentText())) { - QRegExp regExp(str); - regExp.setPatternSyntax(QRegExp::Wildcard); + QRegularExpression regExp(QRegularExpression::wildcardToRegularExpression(str)); if (f_name.contains(regExp)) { contains = true; -- cgit v1.2.3-13-gbd6f