ported some code to QRegularExpression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9523 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp
index c134e6659..0341543fb 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.cpp
+++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp
@@ -21,7 +21,7 @@
 #include <QObject>
 #include <QIODevice>
 #include <QFile>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <math.h>
 #include <stdint.h>
 #include <qmmp/cueparser.h>
@@ -53,7 +53,7 @@ bool DecoderWavPack::initialize()
     {
         QString p = m_path;
         p.remove("wvpack://");
-        p.remove(QRegExp("#\\d+$"));
+        p.remove(QRegularExpression("#\\d+$"));
 #if defined(Q_OS_WIN) && defined(OPEN_FILE_UTF8)
         m_context = WavpackOpenFileInput (p.toUtf8().constData(),
                                           err, OPEN_WVC | OPEN_TAGS | OPEN_FILE_UTF8, 0);
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
index c10343927..76472af30 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
@@ -20,6 +20,7 @@
 
 #include <QMessageBox>
 #include <QFileInfo>
+#include <QRegularExpression>
 #include <qmmp/cueparser.h>
 #include "wavpackmetadatamodel.h"
 #include "decoder_wavpack.h"
@@ -62,7 +63,7 @@ QList<TrackInfo *> DecoderWavPackFactory::createPlayList(const QString &path, Tr
     if(path.contains("://")) //is it cue track?
     {
         filePath.remove("wvpack://");
-        filePath.remove(QRegExp("#\\d+$"));
+        filePath.remove(QRegularExpression("#\\d+$"));
         track = path.section("#", -1).toInt();
         parts = TrackInfo::AllParts; //extract all metadata for single cue track
     }
diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
index bbb56d0a1..fd6fd34c6 100644
--- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
+++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp
@@ -28,7 +28,7 @@ WavPackMetaDataModel::WavPackMetaDataModel(const QString &path, bool readOnly) :
     if(m_path.contains("://"))
     {
         m_path.remove("wvpack://");
-        m_path.remove(QRegExp("#\\d+$"));
+        m_path.remove(QRegularExpression("#\\d+$"));
     }
 
     char err[80] = {0};