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/flac/decoderflacfactory.cpp | 4 ++-- src/plugins/Input/flac/decoderflacfactory.h | 2 +- src/plugins/Input/flac/flacmetadatamodel.cpp | 2 +- src/plugins/Input/flac/flacmetadatamodel.h | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/plugins/Input/flac') 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 DecoderFLACFactory::createPlayList(const QString &path, TrackI return QList() << 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 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 #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 tags() const; QPixmap cover() const; -- cgit v1.2.3-13-gbd6f