From 1cc4b9337707fa975cbf0f6885f1b7ab7a4c5fd4 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 14 Sep 2018 20:58:05 +0000 Subject: removed Q_OBJECT from MetaDataModel git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8289 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/wavpack/decoderwavpackfactory.cpp | 4 ++-- src/plugins/Input/wavpack/decoderwavpackfactory.h | 2 +- src/plugins/Input/wavpack/wavpackmetadatamodel.cpp | 4 ++-- src/plugins/Input/wavpack/wavpackmetadatamodel.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/Input/wavpack') 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 DecoderWavPackFactory::createPlayList(const QString &path, Tr return QList() << 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 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 #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 extraProperties() const; QList tags() const; -- cgit v1.2.3-13-gbd6f