diff options
Diffstat (limited to 'src/plugins/Input/modplug')
4 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 89ba9ba4e..1e3174e88 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -119,10 +119,10 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr return list; } -MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return new ModPlugMetaDataModel(path, parent); + return new ModPlugMetaDataModel(path); } void DecoderModPlugFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index 0108c2c31..b88b98e03 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.h @@ -33,7 +33,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/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index cd1636ea3..059901e71 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -29,11 +29,11 @@ #define MAX_MESSAGE_LENGTH 4000 -ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent) +ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path) : MetaDataModel(true) { m_soundFile = 0; m_path = path; - ArchiveReader reader(this); + ArchiveReader reader(nullptr); if(reader.isSupported(m_path)) { m_buffer = reader.unpack(m_path); diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.h b/src/plugins/Input/modplug/modplugmetadatamodel.h index b484e4346..5568e6ee3 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.h +++ b/src/plugins/Input/modplug/modplugmetadatamodel.h @@ -21,16 +21,15 @@ #ifndef MODPLUGMETADATAMODEL_H #define MODPLUGMETADATAMODEL_H - #include <qmmp/metadatamodel.h> class CSoundFile; class ModPlugMetaDataModel : public MetaDataModel { -Q_OBJECT + Q_DECLARE_TR_FUNCTIONS(ModPlugMetaDataModel) public: - ModPlugMetaDataModel(const QString &path, QObject *parent); + ModPlugMetaDataModel(const QString &path); ~ModPlugMetaDataModel(); QList<MetaDataItem> extraProperties() const; QList<MetaDataItem> descriptions() const; |