diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-10-23 20:11:14 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-10-23 20:11:14 +0000 |
| commit | 95c8717ceeb61baccdcc5929fecf1faa3e2e98cf (patch) | |
| tree | d0702ab9b74bcef3d98386b8282eec9c6f2fe32b /src/plugins | |
| parent | b55c45843527655a14af6ab1f67164244aa6b411 (diff) | |
| download | qmmp-95c8717ceeb61baccdcc5929fecf1faa3e2e98cf.tar.gz qmmp-95c8717ceeb61baccdcc5929fecf1faa3e2e98cf.tar.bz2 qmmp-95c8717ceeb61baccdcc5929fecf1faa3e2e98cf.zip | |
ported some code to QRegularExpression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9524 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
7 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp index 8a5db864c..65356a5fb 100644 --- a/src/plugins/General/streambrowser/streamwindow.cpp +++ b/src/plugins/General/streambrowser/streamwindow.cpp @@ -22,7 +22,6 @@ #include <QNetworkReply> #include <QNetworkProxy> #include <QUrl> -#include <QRegExp> #include <QStandardItemModel> #include <QSortFilterProxyModel> #include <QSettings> diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp index bbe2151c5..08b14361f 100644 --- a/src/plugins/Input/archive/archiveinputdevice.cpp +++ b/src/plugins/Input/archive/archiveinputdevice.cpp @@ -18,15 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QRegExp> +#include <QRegularExpression> #include "archiveinputdevice.h" ArchiveInputDevice::ArchiveInputDevice(const QString &url, QObject *parent) : QIODevice(parent) { QString filePath = url.section("#", -1); QString archivePath = url; - archivePath.remove(QRegExp("^.+://")); - archivePath.remove(QRegExp("#.+$")); + archivePath.remove(QRegularExpression("^.+://")); + archivePath.remove(QRegularExpression("#.+$")); m_archive = archive_read_new(); archive_read_support_filter_all(m_archive); diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp index 34a37aa01..19a06f4ac 100644 --- a/src/plugins/Input/archive/decoder_archive.cpp +++ b/src/plugins/Input/archive/decoder_archive.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include <QFile> +#include <QRegularExpression> #include <archive_entry.h> #include "archiveinputdevice.h" #include "archivetagreader.h" @@ -45,8 +46,8 @@ bool DecoderArchive::initialize() { QString filePath = m_url.section("#", -1); QString archivePath = m_url; - archivePath.remove(QRegExp("^.+://")); - archivePath.remove(QRegExp("#.+$")); + archivePath.remove(QRegularExpression("^.+://")); + archivePath.remove(QRegularExpression("#.+$")); if(!QFile::exists(archivePath)) { diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index eacc7becb..8a7e626e8 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QRegExp> +#include <QRegularExpression> #include <QMessageBox> #include <archive.h> #include <archive_entry.h> @@ -67,8 +67,8 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr { requiredFilePath = path.section("#", -1); archivePath = path; - archivePath.remove(QRegExp("^.+://")); - archivePath.remove(QRegExp("#.+$")); + archivePath.remove(QRegularExpression("^.+://")); + archivePath.remove(QRegularExpression("#.+$")); } else { diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index bcba93e9c..326aa942b 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -22,7 +22,6 @@ #include <QFile> #include <QMessageBox> #include <QStringList> -#include <QRegExp> #include <libmodplug/stdafx.h> #include <libmodplug/it_defs.h> #include <libmodplug/sndfile.h> diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index 55cd7409e..368f79ab6 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QSettings> -#include <QRegExp> #include <QMessageBox> #include <QFile> #include <sidplayfp/SidTune.h> diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 3d8249b3b..1b1a1fd56 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QRegExp> #include <QFileInfo> #ifdef Q_OS_WIN #include <windows.h> |