diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-06 19:27:03 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-06 19:27:03 +0000 |
| commit | 8a6f982632b4f4710576685a5647a771384ab29a (patch) | |
| tree | 9ca763e18279d42aa4c7b29530612768db1bbf01 /src/plugins/Input/mpeg | |
| parent | 1b0fef3d25ed94518f4f6b1914a7d7e71aae80c5 (diff) | |
| download | qmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.gz qmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.bz2 qmmp-8a6f982632b4f4710576685a5647a771384ab29a.zip | |
using override keyword
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mpeg')
| -rw-r--r-- | src/plugins/Input/mpeg/decoder_mad.h | 10 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/decoder_mpg123.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/decoder_mpg123.h | 13 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/decodermpegfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/decodermpegfactory.h | 18 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.h | 28 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/settingsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/settingsdialog.h | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/tagextractor.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/tagextractor.h | 2 |
11 files changed, 42 insertions, 43 deletions
diff --git a/src/plugins/Input/mpeg/decoder_mad.h b/src/plugins/Input/mpeg/decoder_mad.h index 8980f1768..bd986b80f 100644 --- a/src/plugins/Input/mpeg/decoder_mad.h +++ b/src/plugins/Input/mpeg/decoder_mad.h @@ -35,11 +35,11 @@ public: virtual ~DecoderMAD(); // standard decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *data, qint64 size); - void seek(qint64); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *data, qint64 size) override; + void seek(qint64) override; private: //LAME header diff --git a/src/plugins/Input/mpeg/decoder_mpg123.cpp b/src/plugins/Input/mpeg/decoder_mpg123.cpp index 9a1a5f18b..b436cb6fc 100644 --- a/src/plugins/Input/mpeg/decoder_mpg123.cpp +++ b/src/plugins/Input/mpeg/decoder_mpg123.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2018 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mpeg/decoder_mpg123.h b/src/plugins/Input/mpeg/decoder_mpg123.h index 8b19007e0..9177dbeee 100644 --- a/src/plugins/Input/mpeg/decoder_mpg123.h +++ b/src/plugins/Input/mpeg/decoder_mpg123.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2018 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,12 +34,11 @@ public: virtual ~DecoderMPG123(); // standard decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *data, qint64 size); - qint64 read(float *data, qint64 samples); - void seek(qint64); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *data, qint64 size) override; + void seek(qint64) override; private: void cleanup(mpg123_handle *handle); diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index a251fc750..7247e3b3c 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2018 by Ilya Kotov * + * Copyright (C) 2008-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h index 52210fb23..e0637b27d 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.h +++ b/src/plugins/Input/mpeg/decodermpegfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,14 +30,14 @@ Q_INTERFACES(DecoderFactory) public: DecoderMPEGFactory(); - bool canDecode(QIODevice *input) const; - 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); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + bool canDecode(QIODevice *input) const override; + DecoderProperties properties() const override; + Decoder *create(const QString &, QIODevice *input) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; private: bool m_using_rusxmms; diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index a960a15a3..8771865d4 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.h b/src/plugins/Input/mpeg/mpegmetadatamodel.h index b50710986..bb3a5fc36 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.h +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,11 +33,11 @@ class MPEGMetaDataModel : public MetaDataModel public: MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly); ~MPEGMetaDataModel(); - QList<MetaDataItem> extraProperties() const; - QList<TagModel* > tags() const; - QPixmap cover() const; - void setCover(const QPixmap &pix); - void removeCover(); + QList<MetaDataItem> extraProperties() const override; + QList<TagModel* > tags() const override; + QPixmap cover() const override; + void setCover(const QPixmap &pix) override; + void removeCover() override; private: QList<TagModel* > m_tags; @@ -50,14 +50,14 @@ class MpegFileTagModel : public TagModel public: MpegFileTagModel(bool using_rusxmms, TagLib::MPEG::File *file, TagLib::MPEG::File::TagTypes tagType); ~MpegFileTagModel(); - QString name() const; - QList<Qmmp::MetaData> keys() const; - QString value(Qmmp::MetaData key) const; - void setValue(Qmmp::MetaData key, const QString &value); - bool exists() const; - void create(); - void remove(); - void save(); + QString name() const override; + QList<Qmmp::MetaData> keys() const override; + QString value(Qmmp::MetaData key) const override; + void setValue(Qmmp::MetaData key, const QString &value) override; + bool exists() const override; + void create() override; + void remove() override; + void save() override; private: bool m_using_rusxmms; diff --git a/src/plugins/Input/mpeg/settingsdialog.cpp b/src/plugins/Input/mpeg/settingsdialog.cpp index c73876ad2..75ef4f0e8 100644 --- a/src/plugins/Input/mpeg/settingsdialog.cpp +++ b/src/plugins/Input/mpeg/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mpeg/settingsdialog.h b/src/plugins/Input/mpeg/settingsdialog.h index 1a08d76f3..5fae03231 100644 --- a/src/plugins/Input/mpeg/settingsdialog.h +++ b/src/plugins/Input/mpeg/settingsdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -37,7 +37,7 @@ public: enum TagType {ID3v1 = 0, ID3v2, APE, Disabled}; public slots: - void accept(); + void accept() override; private: void findCodecs(); diff --git a/src/plugins/Input/mpeg/tagextractor.cpp b/src/plugins/Input/mpeg/tagextractor.cpp index 948b57f67..afe658be7 100644 --- a/src/plugins/Input/mpeg/tagextractor.cpp +++ b/src/plugins/Input/mpeg/tagextractor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2018 by Ilya Kotov * + * Copyright (C) 2008-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mpeg/tagextractor.h b/src/plugins/Input/mpeg/tagextractor.h index 9b142c26f..77e4457d7 100644 --- a/src/plugins/Input/mpeg/tagextractor.h +++ b/src/plugins/Input/mpeg/tagextractor.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2018 by Ilya Kotov * + * Copyright (C) 2008-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * |
