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

4 files changed, 9 insertions, 9 deletions

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;