diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Input/cue/settingsdialog.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/settingsdialog.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Transports/http/settingsdialog.cpp | 8 |
3 files changed, 15 insertions, 9 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; 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; diff --git a/src/plugins/Transports/http/settingsdialog.cpp b/src/plugins/Transports/http/settingsdialog.cpp index c8631af02..e53c70e33 100644 --- a/src/plugins/Transports/http/settingsdialog.cpp +++ b/src/plugins/Transports/http/settingsdialog.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include <QTextCodec> #include <QSettings> +#include <QRegularExpression> #include <qmmp/qmmp.h> #ifdef WITH_ENCA #include <enca.h> @@ -78,7 +79,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()) { @@ -86,6 +87,7 @@ void SettingsDialog::findCodecs() QString sortKey = codec->name().toUpper(); int rank; + QRegularExpressionMatch match; if (sortKey.startsWith("UTF-8")) { @@ -95,9 +97,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; |