diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-10-23 19:58:43 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-10-23 19:58:43 +0000 |
| commit | b55c45843527655a14af6ab1f67164244aa6b411 (patch) | |
| tree | da26a4b7a7d453e58055cfde4b26d2f0991ed8f7 /src/plugins/Input/flac | |
| parent | 6aabcfba6c8f4175e967406a7ab874f0692e18f4 (diff) | |
| download | qmmp-b55c45843527655a14af6ab1f67164244aa6b411.tar.gz qmmp-b55c45843527655a14af6ab1f67164244aa6b411.tar.bz2 qmmp-b55c45843527655a14af6ab1f67164244aa6b411.zip | |
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
Diffstat (limited to 'src/plugins/Input/flac')
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoderflacfactory.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/Input/flac/flacmetadatamodel.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
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)) |