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/vorbis/decodervorbisfactory.cpp | 4 ++-- src/plugins/Input/vorbis/decodervorbisfactory.h | 2 +- src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 4 ++-- src/plugins/Input/vorbis/vorbismetadatamodel.h | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/plugins/Input/vorbis') 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 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 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 #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; -- cgit v1.2.3-13-gbd6f