diff options
Diffstat (limited to 'src/plugins/Input/mpeg')
| -rw-r--r-- | src/plugins/Input/mpeg/decodermpegfactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/decodermpegfactory.h | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index 5d9e6202a..0c1356262 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -361,9 +361,9 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderMPEGFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderMPEGFactory::createMetaDataModel(const QString &path, bool readOnly) { - return new MPEGMetaDataModel(m_using_rusxmms, path, readOnly, parent); + return new MPEGMetaDataModel(m_using_rusxmms, path, readOnly); } void DecoderMPEGFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h index 58a3487ff..52210fb23 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.h +++ b/src/plugins/Input/mpeg/decodermpegfactory.h @@ -34,7 +34,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *input); 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/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index 15712d0b5..3399c901d 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -34,8 +34,8 @@ #include <taglib/id3v2framefactory.h> #include "mpegmetadatamodel.h" -MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly, QObject *parent) : - MetaDataModel(readOnly, parent) +MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly) : + MetaDataModel(readOnly) { m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); m_file = new TagLib::MPEG::File(m_stream, TagLib::ID3v2::FrameFactory::instance()); diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.h b/src/plugins/Input/mpeg/mpegmetadatamodel.h index ec2e15355..dc0b2c77a 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.h +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.h @@ -29,9 +29,9 @@ class QTextCodec; class MPEGMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(MPEGMetaDataModel) public: - MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly, QObject *parent); + MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly); ~MPEGMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<TagModel* > tags() const; |
