diff options
Diffstat (limited to 'src/plugins/Input/archive')
| -rw-r--r-- | src/plugins/Input/archive/archiveinputdevice.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Input/archive/decoder_archive.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/Input/archive/decoderarchivefactory.cpp | 6 |
3 files changed, 9 insertions, 8 deletions
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 { |
