diff options
Diffstat (limited to 'src/plugins/Input/cue/settingsdialog.cpp')
| -rw-r--r-- | src/plugins/Input/cue/settingsdialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp index 5f6a936b4..c8cf8b5a2 100644 --- a/src/plugins/Input/cue/settingsdialog.cpp +++ b/src/plugins/Input/cue/settingsdialog.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include <QTextCodec> #include <QSettings> +#include <QRegularExpression> #include <qmmp/qmmp.h> #ifdef WITH_ENCA @@ -77,7 +78,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()) { @@ -85,6 +86,7 @@ void SettingsDialog::findCodecs() QString sortKey = codec->name().toUpper(); int rank; + QRegularExpressionMatch match; if (sortKey.startsWith("UTF-8")) { @@ -94,9 +96,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; |