diff options
Diffstat (limited to 'src/plugins/Input')
50 files changed, 74 insertions, 86 deletions
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 1589f9551..eca457612 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -88,11 +88,10 @@ QList<TrackInfo *> DecoderAACFactory::createPlayList(const QString &path, TrackI return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderAACFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderAACFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(path); Q_UNUSED(readOnly); - Q_UNUSED(parent); return 0; } diff --git a/src/plugins/Input/aac/decoderaacfactory.h b/src/plugins/Input/aac/decoderaacfactory.h index adf84d3c2..fdaa1b5ba 100644 --- a/src/plugins/Input/aac/decoderaacfactory.h +++ b/src/plugins/Input/aac/decoderaacfactory.h @@ -33,7 +33,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString&, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 3f64fff6d..50a994229 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -136,11 +136,10 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr return list; } -MetaDataModel* DecoderArchiveFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderArchiveFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(path); Q_UNUSED(readOnly); - Q_UNUSED(parent); return 0; } diff --git a/src/plugins/Input/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h index cd7a1e862..c9e708aff 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.h +++ b/src/plugins/Input/archive/decoderarchivefactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &url, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 5d32240ac..2f030bcb8 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -66,9 +66,8 @@ QList<TrackInfo *> DecoderCDAudioFactory::createPlayList(const QString &path, Tr return list; } -MetaDataModel* DecoderCDAudioFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderCDAudioFactory::createMetaDataModel(const QString &path, bool readOnly) { - Q_UNUSED(parent); Q_UNUSED(readOnly); Q_UNUSED(path); return 0; diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index 437d6ad24..b67d4df18 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h @@ -33,7 +33,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp index 4f68ade0a..f4904f09f 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.cpp +++ b/src/plugins/Input/cue/cuemetadatamodel.cpp @@ -22,7 +22,7 @@ #include "cueparser.h" #include "cuemetadatamodel.h" -CUEMetaDataModel::CUEMetaDataModel(const QString &url, QObject *parent) : MetaDataModel(true, parent) +CUEMetaDataModel::CUEMetaDataModel(const QString &url) : MetaDataModel(true) { m_parser = new CUEParser(url); if (m_parser->count() == 0) @@ -42,7 +42,7 @@ CUEMetaDataModel::~CUEMetaDataModel() QList<MetaDataItem> CUEMetaDataModel::extraProperties() const { QList<MetaDataItem> ep; - MetaDataModel *model = MetaDataManager::instance()->createMetaDataModel(m_path, true, nullptr); + MetaDataModel *model = MetaDataManager::instance()->createMetaDataModel(m_path, true); if(model) { ep = model->extraProperties(); diff --git a/src/plugins/Input/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h index 80b3bb93f..7aaad97f9 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.h +++ b/src/plugins/Input/cue/cuemetadatamodel.h @@ -27,9 +27,8 @@ class CUEParser; class CUEMetaDataModel : public MetaDataModel { -Q_OBJECT public: - CUEMetaDataModel(const QString &url, QObject *parent); + CUEMetaDataModel(const QString &url); ~CUEMetaDataModel(); QList<MetaDataItem> extraProperties() const; QString coverPath() const; diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index e3a118cdf..103f4b597 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -74,10 +74,10 @@ QList<TrackInfo *> DecoderCUEFactory::createPlayList(const QString &path, TrackI } } -MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return path.startsWith("cue://") ? new CUEMetaDataModel(path, parent) : 0; + return path.startsWith("cue://") ? new CUEMetaDataModel(path) : 0; } void DecoderCUEFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h index b134b5eaf..03dc25c00 100644 --- a/src/plugins/Input/cue/decodercuefactory.h +++ b/src/plugins/Input/cue/decodercuefactory.h @@ -35,7 +35,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index b40a558c8..e82e39900 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -237,10 +237,10 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return new FFmpegMetaDataModel(path, parent); + return new FFmpegMetaDataModel(path); } void DecoderFFmpegFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h index 3a77deefa..60112ec2f 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h @@ -35,7 +35,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 14feeaf03..d3b725744 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -21,7 +21,7 @@ #include <stdint.h> #include "ffmpegmetadatamodel.h" -FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent) +FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true) { m_in = 0; #ifdef Q_OS_WIN diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h index f41f89d47..32f521e62 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h @@ -33,9 +33,8 @@ extern "C"{ class FFmpegMetaDataModel : public MetaDataModel { -Q_OBJECT public: - FFmpegMetaDataModel(const QString &path, QObject *parent); + FFmpegMetaDataModel(const QString &path); ~FFmpegMetaDataModel(); QPixmap cover() const; diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 9de7a7c64..02ae1f6bf 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -195,10 +195,10 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI return QList<TrackInfo *>() << info; } -MetaDataModel* DecoderFLACFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderFLACFactory::createMetaDataModel(const QString &path, bool readOnly) { if (!path.contains("://") || path.startsWith("flac://")) - return new FLACMetaDataModel(path, readOnly, parent); + return new FLACMetaDataModel(path, readOnly); else return 0; } diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h index 9ac70b3f7..55b7dbb59 100644 --- a/src/plugins/Input/flac/decoderflacfactory.h +++ b/src/plugins/Input/flac/decoderflacfactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo*> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index baefc62ce..35ea80836 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -27,7 +27,7 @@ #include <qmmp/metadatamanager.h> #include "flacmetadatamodel.h" -FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly, QObject *parent) : MetaDataModel(true, parent) +FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly) : MetaDataModel(true) { m_file = 0; m_stream = 0; diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h index eb418705f..3eee80986 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.h +++ b/src/plugins/Input/flac/flacmetadatamodel.h @@ -29,9 +29,8 @@ class FLACMetaDataModel : public MetaDataModel { -Q_OBJECT public: - FLACMetaDataModel(const QString &path, bool readOnly, QObject *parent); + FLACMetaDataModel(const QString &path, bool readOnly); ~FLACMetaDataModel(); QList<TagModel* > tags() const; QPixmap cover() const; diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index b8e61648c..cbd7fed44 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -85,11 +85,10 @@ QList<TrackInfo *> DecoderGmeFactory::createPlayList(const QString &path, TrackI return helper.createPlayList(parts); } -MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(path); Q_UNUSED(readOnly); - Q_UNUSED(parent); return 0; } diff --git a/src/plugins/Input/gme/decodergmefactory.h b/src/plugins/Input/gme/decodergmefactory.h index 02e872b06..e02b504b9 100644 --- a/src/plugins/Input/gme/decodergmefactory.h +++ b/src/plugins/Input/gme/decodergmefactory.h @@ -36,7 +36,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &path, QIODevice *input); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 89ba9ba4e..1e3174e88 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -119,10 +119,10 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr return list; } -MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return new ModPlugMetaDataModel(path, parent); + return new ModPlugMetaDataModel(path); } void DecoderModPlugFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index 0108c2c31..b88b98e03 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.h @@ -33,7 +33,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index cd1636ea3..059901e71 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -29,11 +29,11 @@ #define MAX_MESSAGE_LENGTH 4000 -ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent) +ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path) : MetaDataModel(true) { m_soundFile = 0; m_path = path; - ArchiveReader reader(this); + ArchiveReader reader(nullptr); if(reader.isSupported(m_path)) { m_buffer = reader.unpack(m_path); diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.h b/src/plugins/Input/modplug/modplugmetadatamodel.h index b484e4346..5568e6ee3 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.h +++ b/src/plugins/Input/modplug/modplugmetadatamodel.h @@ -21,16 +21,15 @@ #ifndef MODPLUGMETADATAMODEL_H #define MODPLUGMETADATAMODEL_H - #include <qmmp/metadatamodel.h> class CSoundFile; class ModPlugMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(ModPlugMetaDataModel) public: - ModPlugMetaDataModel(const QString &path, QObject *parent); + ModPlugMetaDataModel(const QString &path); ~ModPlugMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<MetaDataItem> descriptions() const; diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index 9161ff598..da1e17bbb 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -99,9 +99,9 @@ QList<TrackInfo *> DecoderMPCFactory::createPlayList(const QString &path, TrackI return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderMPCFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderMPCFactory::createMetaDataModel(const QString &path, bool readOnly) { - return new MPCMetaDataModel(path, readOnly, parent); + return new MPCMetaDataModel(path, readOnly); } void DecoderMPCFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h index 8dcf3e95b..d8caeb9e4 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.h +++ b/src/plugins/Input/mpc/decodermpcfactory.h @@ -33,7 +33,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &url, QIODevice *i); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index a510a32b9..fd7b56481 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,7 @@ #include <taglib/apetag.h> #include "mpcmetadatamodel.h" -MPCMetaDataModel::MPCMetaDataModel(const QString &path, bool readOnly, QObject *parent) : MetaDataModel(readOnly, parent) +MPCMetaDataModel::MPCMetaDataModel(const QString &path, bool readOnly) : MetaDataModel(readOnly) { m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); m_file = new TagLib::MPC::File(m_stream); diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.h b/src/plugins/Input/mpc/mpcmetadatamodel.h index 70a571f98..a37c40142 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.h +++ b/src/plugins/Input/mpc/mpcmetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,9 +30,8 @@ class QTextCodec; class MPCMetaDataModel : public MetaDataModel { -Q_OBJECT public: - MPCMetaDataModel(const QString &path, bool readOnly, QObject *parent); + MPCMetaDataModel(const QString &path, bool readOnly); ~MPCMetaDataModel(); QList<TagModel* > tags() const; diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index 5d9e6202a..0c1356262 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -361,9 +361,9 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderMPEGFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderMPEGFactory::createMetaDataModel(const QString &path, bool readOnly) { - return new MPEGMetaDataModel(m_using_rusxmms, path, readOnly, parent); + return new MPEGMetaDataModel(m_using_rusxmms, path, readOnly); } void DecoderMPEGFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h index 58a3487ff..52210fb23 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.h +++ b/src/plugins/Input/mpeg/decodermpegfactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *input); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index 15712d0b5..3399c901d 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -34,8 +34,8 @@ #include <taglib/id3v2framefactory.h> #include "mpegmetadatamodel.h" -MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly, QObject *parent) : - MetaDataModel(readOnly, parent) +MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly) : + MetaDataModel(readOnly) { m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); m_file = new TagLib::MPEG::File(m_stream, TagLib::ID3v2::FrameFactory::instance()); diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.h b/src/plugins/Input/mpeg/mpegmetadatamodel.h index ec2e15355..dc0b2c77a 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.h +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.h @@ -29,9 +29,9 @@ class QTextCodec; class MPEGMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(MPEGMetaDataModel) public: - MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly, QObject *parent); + MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly); ~MPEGMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<TagModel* > tags() const; diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp index 9b86e046a..95e913a36 100644 --- a/src/plugins/Input/opus/decoderopusfactory.cpp +++ b/src/plugins/Input/opus/decoderopusfactory.cpp @@ -55,9 +55,9 @@ Decoder *DecoderOpusFactory::create(const QString &url, QIODevice *input) return new DecoderOpus(url, input); } -MetaDataModel* DecoderOpusFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderOpusFactory::createMetaDataModel(const QString &path, bool readOnly) { - return new OpusMetaDataModel(path, readOnly, parent); + return new OpusMetaDataModel(path, readOnly); } QList<TrackInfo *> DecoderOpusFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) diff --git a/src/plugins/Input/opus/decoderopusfactory.h b/src/plugins/Input/opus/decoderopusfactory.h index f5b40162e..39a51bd83 100644 --- a/src/plugins/Input/opus/decoderopusfactory.h +++ b/src/plugins/Input/opus/decoderopusfactory.h @@ -36,7 +36,7 @@ public: bool canDecode(QIODevice *input) const; DecoderProperties properties() const; Decoder *create(const QString &path, QIODevice *input); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); QObject* showDetails(QWidget *parent, const QString &path); void showSettings(QWidget *parent); diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp index 7cbc2f8d0..c1ab36a5b 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,8 +26,8 @@ #include <taglib/tmap.h> #include "opusmetadatamodel.h" -OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly, QObject *parent) - : MetaDataModel(readOnly, parent) +OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly) + : MetaDataModel(readOnly) { m_path = path; m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h index 1c7627f34..15b9306ad 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.h +++ b/src/plugins/Input/opus/opusmetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -28,9 +28,9 @@ class OpusMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(OpusMetaDataModel) public: - OpusMetaDataModel(const QString &path, bool readOnly, QObject *parent); + OpusMetaDataModel(const QString &path, bool readOnly); ~OpusMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<TagModel* > tags() const; diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index b5ea3585e..fa54057d8 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -96,11 +96,10 @@ QList<TrackInfo *> DecoderSIDFactory::createPlayList(const QString &path, TrackI return list; } -MetaDataModel* DecoderSIDFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderSIDFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(path); Q_UNUSED(readOnly); - Q_UNUSED(parent); return 0; } diff --git a/src/plugins/Input/sid/decodersidfactory.h b/src/plugins/Input/sid/decodersidfactory.h index 095b307a1..f7f275acf 100644 --- a/src/plugins/Input/sid/decodersidfactory.h +++ b/src/plugins/Input/sid/decodersidfactory.h @@ -40,7 +40,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &path, QIODevice *input); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 5d3a62179..cc492fa00 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -208,7 +208,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr return QList<TrackInfo *>() << info; } -MetaDataModel* DecoderSndFileFactory::createMetaDataModel(const QString&, bool, QObject *) +MetaDataModel* DecoderSndFileFactory::createMetaDataModel(const QString&, bool) { return 0; } diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h index 85d2445c0..205e0d668 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.h +++ b/src/plugins/Input/sndfile/decodersndfilefactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 8c2dcdd50..1ac62a020 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -57,9 +57,9 @@ Decoder *DecoderVorbisFactory::create(const QString &, QIODevice *input) return new DecoderVorbis(input); } -MetaDataModel* DecoderVorbisFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderVorbisFactory::createMetaDataModel(const QString &path, bool readOnly) { - return new VorbisMetaDataModel(path, readOnly, parent); + return new VorbisMetaDataModel(path, readOnly); } QList<TrackInfo *> DecoderVorbisFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h index 93f998e8e..9b2908a96 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.h +++ b/src/plugins/Input/vorbis/decodervorbisfactory.h @@ -36,7 +36,7 @@ public: bool canDecode(QIODevice *input) const; DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *input); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); QObject* showDetails(QWidget *parent, const QString &path); void showSettings(QWidget *parent); diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 121711870..f56869f30 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -26,8 +26,8 @@ #include <taglib/tmap.h> #include "vorbismetadatamodel.h" -VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly, QObject *parent) - : MetaDataModel(readOnly, parent) +VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly) + : MetaDataModel(readOnly) { m_path = path; m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index bdd8d251d..fe8d3ea30 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -31,9 +31,8 @@ class VorbisCommentModel; class VorbisMetaDataModel : public MetaDataModel { -Q_OBJECT public: - VorbisMetaDataModel(const QString &path, bool readOnly, QObject *parent); + VorbisMetaDataModel(const QString &path, bool readOnly); ~VorbisMetaDataModel(); friend class VorbisCommentModel; diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 23f219fe8..f63ccc54d 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -160,10 +160,10 @@ QList<TrackInfo *> DecoderWavPackFactory::createPlayList(const QString &path, Tr return QList<TrackInfo *>() << info; } -MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, bool readOnly) { if (!path.contains("://") || path.startsWith("wvpack://")) - return new WavPackMetaDataModel(path, readOnly, parent); + return new WavPackMetaDataModel(path, readOnly); else return 0; } diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.h b/src/plugins/Input/wavpack/decoderwavpackfactory.h index ba8e52b6b..ce4638144 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.h +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &p, QIODevice *i); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index 634c4ae32..e4b8a9016 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp @@ -22,8 +22,8 @@ #include <qmmp/metadatamanager.h> #include "wavpackmetadatamodel.h" -WavPackMetaDataModel::WavPackMetaDataModel(const QString &path, bool readOnly, QObject *parent) - : MetaDataModel(readOnly, parent) +WavPackMetaDataModel::WavPackMetaDataModel(const QString &path, bool readOnly) + : MetaDataModel(readOnly) { if(path.contains("://")) { diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h index 823111758..8338b0645 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.h @@ -28,9 +28,9 @@ extern "C"{ class WavPackMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(WavPackMetaDataModel) public: - WavPackMetaDataModel(const QString &path, bool readOnly, QObject *parent); + WavPackMetaDataModel(const QString &path, bool readOnly); ~WavPackMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<TagModel* > tags() const; diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index 67652ac5b..c57d14c49 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp @@ -88,11 +88,10 @@ QList<TrackInfo *> DecoderWildMidiFactory::createPlayList(const QString &path, T return QList<TrackInfo *>() << info; } -MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(path); Q_UNUSED(readOnly); - Q_UNUSED(parent); return 0; } diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.h b/src/plugins/Input/wildmidi/decoderwildmidifactory.h index 05bc8d84c..e604060f2 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.h +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &path, QIODevice *input); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; |