aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg
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/ffmpeg
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/ffmpeg')
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp4
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.h2
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h3
4 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index b40a558c8..e82e39900 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -237,10 +237,10 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
return QList<TrackInfo*>() << info;
}
-MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent)
+MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly)
{
Q_UNUSED(readOnly);
- return new FFmpegMetaDataModel(path, parent);
+ return new FFmpegMetaDataModel(path);
}
void DecoderFFmpegFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
index 3a77deefa..60112ec2f 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
@@ -35,7 +35,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo *> 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/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index 14feeaf03..d3b725744 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -21,7 +21,7 @@
#include <stdint.h>
#include "ffmpegmetadatamodel.h"
-FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent)
+FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true)
{
m_in = 0;
#ifdef Q_OS_WIN
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
index f41f89d47..32f521e62 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
@@ -33,9 +33,8 @@ extern "C"{
class FFmpegMetaDataModel : public MetaDataModel
{
-Q_OBJECT
public:
- FFmpegMetaDataModel(const QString &path, QObject *parent);
+ FFmpegMetaDataModel(const QString &path);
~FFmpegMetaDataModel();
QPixmap cover() const;