aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/flac
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-09-14 20:58:05 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-09-14 20:58:05 +0000
commit1cc4b9337707fa975cbf0f6885f1b7ab7a4c5fd4 (patch)
tree4a76bd38324fa31d8e8ea00b707ec7c93ae6bc07 /src/plugins/Input/flac
parentbd74cefa9108ea333de389aa154ffb335e37d015 (diff)
downloadqmmp-1cc4b9337707fa975cbf0f6885f1b7ab7a4c5fd4.tar.gz
qmmp-1cc4b9337707fa975cbf0f6885f1b7ab7a4c5fd4.tar.bz2
qmmp-1cc4b9337707fa975cbf0f6885f1b7ab7a4c5fd4.zip
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
Diffstat (limited to 'src/plugins/Input/flac')
-rw-r--r--src/plugins/Input/flac/decoderflacfactory.cpp4
-rw-r--r--src/plugins/Input/flac/decoderflacfactory.h2
-rw-r--r--src/plugins/Input/flac/flacmetadatamodel.cpp2
-rw-r--r--src/plugins/Input/flac/flacmetadatamodel.h3
4 files changed, 5 insertions, 6 deletions
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<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI
return QList<TrackInfo *>() << 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<TrackInfo*> 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 <qmmp/metadatamanager.h>
#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<TagModel* > tags() const;
QPixmap cover() const;