aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/mpeg
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input/mpeg')
-rw-r--r--src/plugins/Input/mpeg/settingsdialog.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/Input/mpeg/settingsdialog.cpp b/src/plugins/Input/mpeg/settingsdialog.cpp
index 3e969729b..5e20a7e1c 100644
--- a/src/plugins/Input/mpeg/settingsdialog.cpp
+++ b/src/plugins/Input/mpeg/settingsdialog.cpp
@@ -20,6 +20,7 @@
#include <QTextCodec>
#include <QSettings>
#include <QFile>
+#include <QRegularExpression>
#include <qmmp/qmmp.h>
#include "settingsdialog.h"
@@ -92,7 +93,7 @@ void SettingsDialog::accept()
void SettingsDialog::findCodecs()
{
QMap<QString, QTextCodec *> codecMap;
- QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
+ static const QRegularExpression iso8859RegExp("ISO[- ]8859-([0-9]+).*");
for(int mib : QTextCodec::availableMibs())
{
@@ -100,6 +101,7 @@ void SettingsDialog::findCodecs()
QString sortKey = codec->name().toUpper();
int rank;
+ QRegularExpressionMatch match;
if (sortKey.startsWith("UTF-8"))
{
@@ -109,9 +111,9 @@ void SettingsDialog::findCodecs()
{
rank = 2;
}
- else if (iso8859RegExp.exactMatch(sortKey))
+ else if ((match = iso8859RegExp.match(sortKey)).hasMatch())
{
- if (iso8859RegExp.cap(1).size() == 1)
+ if (match.captured(1).size() == 1)
rank = 3;
else
rank = 4;