From 81170fffef768feee0c91ae953f2c05d1fed6a75 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 26 Oct 2020 21:18:54 +0000 Subject: ported some code to QRegularExpression and QDir::match git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9531 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/playlistparser.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/qmmpui/playlistparser.cpp') diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index 2aac76bda..e1fdc1756 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include -#include #include #include #include @@ -61,13 +60,7 @@ QStringList PlayListParser::filters() bool PlayListParser::isPlayList(const QString &url) { - for(const QString &filter : nameFilters()) - { - QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(r.exactMatch(url)) - return true; - } - return false; + return QDir::match(nameFilters(), url.section(QChar('/'), -1)); } PlayListFormat *PlayListParser::findByMime(const QString &mime) @@ -83,12 +76,8 @@ PlayListFormat *PlayListParser::findByPath(const QString &filePath) loadFormats(); for(PlayListFormat *format : qAsConst(*m_formats)) { - for(const QString &filter : format->properties().filters) - { - QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(r.exactMatch(filePath)) - return format; - } + if(QDir::match(format->properties().filters, filePath.section(QChar('/'), -1))) + return format; } return nullptr; } -- cgit v1.2.3-13-gbd6f