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/mpc/decodermpcfactory.cpp | 4 ++-- src/plugins/Input/mpc/decodermpcfactory.h | 2 +- src/plugins/Input/mpc/mpcmetadatamodel.cpp | 4 ++-- src/plugins/Input/mpc/mpcmetadatamodel.h | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/plugins/Input/mpc') 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 DecoderMPCFactory::createPlayList(const QString &path, TrackI return QList() << 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 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 #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 tags() const; -- cgit v1.2.3-13-gbd6f