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

15 files changed, 27 insertions, 21 deletions

diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index d2cf8dda9..d48a87b4e 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -20,7 +20,7 @@
 
 
 #include <QObject>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QFileInfo>
 #include <QDir>
@@ -387,7 +387,7 @@ bool DecoderCDAudio::initialize()
     int track_number = m_url.section("#", -1).toInt();
     QString device_path = m_url;
     device_path.remove("cdda://");
-    device_path.remove(QRegExp("#\\d+$"));
+    device_path.remove(QRegularExpression("#\\d+$"));
 
     track_number = qMax(track_number, 1);
     QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(device_path); //generate track list
diff --git a/src/plugins/Input/cue/cuefile.cpp b/src/plugins/Input/cue/cuefile.cpp
index d1980fe39..d0979e24a 100644
--- a/src/plugins/Input/cue/cuefile.cpp
+++ b/src/plugins/Input/cue/cuefile.cpp
@@ -37,7 +37,7 @@ CueFile::CueFile(const QString &path) : CueParser()
     if(path.contains("://"))
     {
         filePath.remove("cue://");
-        filePath.remove(QRegExp("#\\d+$"));
+        filePath.remove(QRegularExpression("#\\d+$"));
     }
     QFile file(filePath);
     if (!file.open(QIODevice::ReadOnly))
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
index a27a687fe..7e3bad222 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
@@ -20,7 +20,7 @@
 
 #include <QObject>
 #include <QFile>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <qmmp/cueparser.h>
 #include "decoder_ffmpeg.h"
 #include "decoder_ffmpegcue.h"
@@ -54,7 +54,7 @@ bool DecoderFFmpegCue::initialize()
         return false;
     }
     filePath.remove("ffmpeg://");
-    filePath.remove(QRegExp("#\\d+$"));
+    filePath.remove(QRegularExpression("#\\d+$"));
     m_track = m_url.section("#", -1).toInt();
 
     AVFormatContext *in = nullptr;
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 4fb284b98..06666d352 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -21,6 +21,7 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QFileInfo>
+#include <QRegularExpression>
 #include <qmmp/cueparser.h>
 extern "C"{
 #include <libavformat/avformat.h>
@@ -180,7 +181,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
     if(path.contains("://")) //is it cue track?
     {
         filePath.remove("ffmpeg://");
-        filePath.remove(QRegExp("#\\d+$"));
+        filePath.remove(QRegularExpression("#\\d+$"));
         cueTrack = path.section("#", -1).toInt();
         parts = TrackInfo::AllParts; //extract all metadata for single cue track
     }
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index eeb7d3681..032eec593 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QRegularExpression>
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
@@ -33,7 +34,7 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(tr
     if(path.startsWith("ffmpeg://"))
     {
         filePath.remove("ffmpeg://");
-        filePath.remove(QRegExp("#\\d+$"));
+        filePath.remove(QRegularExpression("#\\d+$"));
     }
 
 #ifdef Q_OS_WIN
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index d95b1a9f3..c78207d8b 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -34,6 +34,7 @@
 #include <QObject>
 #include <QFile>
 #include <QIODevice>
+#include <QRegularExpression>
 #include <FLAC/all.h>
 #include <stdint.h>
 #include <qmmp/cueparser.h>
@@ -292,7 +293,7 @@ bool DecoderFLAC::initialize()
         {
             QString p = m_path;
             p.remove("flac://");
-            p.remove(QRegExp("#\\d+$"));
+            p.remove(QRegularExpression("#\\d+$"));
             TagLib::FileStream stream(QStringToFileName(p), true);
             TagLib::FLAC::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
             //looking for cuesheet comment
diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index f6046e6d5..2d4ae3ddb 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -20,6 +20,7 @@
 
 #include <QMessageBox>
 #include <QFileInfo>
+#include <QRegularExpression>
 #include <taglib/tag.h>
 #include <taglib/fileref.h>
 #include <taglib/flacfile.h>
@@ -76,7 +77,7 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI
     if(path.contains("://")) //is it cue track?
     {
         filePath.remove("flac://");
-        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/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index ee7824ae9..47841eeb7 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -42,7 +42,7 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
     if(path.startsWith("flac://"))
     {
         m_path.remove("flac://");
-        m_path.remove(QRegExp("#\\d+$"));
+        m_path.remove(QRegularExpression("#\\d+$"));
     }
 
     if(m_path.endsWith(".flac", Qt::CaseInsensitive))
diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp
index ef8dc227e..bbf258491 100644
--- a/src/plugins/Input/gme/decodergmefactory.cpp
+++ b/src/plugins/Input/gme/decodergmefactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QMessageBox>
-#include <QRegExp>
+#include <QRegularExpression>
 #include "settingsdialog.h"
 #include "gmehelper.h"
 #include "decoder_gme.h"
@@ -62,7 +62,7 @@ QList<TrackInfo *> DecoderGmeFactory::createPlayList(const QString &path, TrackI
     {
         QString filePath = path;
         filePath.remove("gme://");
-        filePath.remove(QRegExp("#\\d+$"));
+        filePath.remove(QRegularExpression("#\\d+$"));
         int track = path.section("#", -1).toInt();
         QList<TrackInfo *> list = createPlayList(filePath, parts, ignoredFiles);
         if (list.isEmpty() || track <= 0 || track > list.count())
diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp
index 474a4ce93..716033b02 100644
--- a/src/plugins/Input/gme/gmehelper.cpp
+++ b/src/plugins/Input/gme/gmehelper.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <qmmp/qmmp.h>
 #include "gmehelper.h"
@@ -49,7 +49,7 @@ Music_Emu *GmeHelper::load(const QString &url, int sample_rate)
     if(url.contains("://"))
     {
         path.remove("gme://");
-        path.remove(QRegExp("#\\d+$"));
+        path.remove(QRegularExpression("#\\d+$"));
     }
     const char *err = nullptr;
     gme_type_t file_type;
diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp
index 2a6c8e566..350936778 100644
--- a/src/plugins/Input/sid/decoder_sid.cpp
+++ b/src/plugins/Input/sid/decoder_sid.cpp
@@ -20,6 +20,7 @@
 
 #include <QFileInfo>
 #include <QSettings>
+#include <QRegularExpression>
 #include <sidplayfp/sidplayfp.h>
 #include <sidplayfp/SidTune.h>
 #include <sidplayfp/sidbuilder.h>
@@ -50,7 +51,7 @@ bool DecoderSID::initialize()
     m_read_bytes = 0;
     QString path = m_url;
     path.remove("sid://");
-    path.remove(QRegExp("#\\d+$"));
+    path.remove(QRegularExpression("#\\d+$"));
     int track = m_url.section("#", -1).toInt();
 
     m_tune.load(qPrintable(path));
diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp
index 701f269a6..e84d3b21a 100644
--- a/src/plugins/Input/sid/sidhelper.cpp
+++ b/src/plugins/Input/sid/sidhelper.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <sidplayfp/SidDatabase.h>
 #include "sidhelper.h"
 
@@ -44,7 +44,7 @@ SidTune *SIDHelper::load(const QString &url)
     if(url.contains("://"))
     {
         path.remove("sid://");
-        path.remove(QRegExp("#\\d+$"));
+        path.remove(QRegularExpression("#\\d+$"));
         track = url.section("#", -1).toInt();
     }
     m_tune = new SidTune(qPrintable(path));
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};