From 4b8d091b06ce56c9797138e62cabfe791b0e60a0 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 25 Oct 2020 21:39:26 +0000
Subject: ported some code to QRegularExpression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9530 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/cue/settingsdialog.cpp  | 8 +++++---
 src/plugins/Input/mpeg/settingsdialog.cpp | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/plugins/Input')

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;
-- 
cgit v1.2.3-13-gbd6f