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 | |
| 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')
103 files changed, 389 insertions, 392 deletions
diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index 8e138b41c..a14002f75 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.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/aac/aacfile.h b/src/plugins/Input/aac/aacfile.h index 62de0fc54..b27a6c1c8 100644 --- a/src/plugins/Input/aac/aacfile.h +++ b/src/plugins/Input/aac/aacfile.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 * diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 6a4c3740c..ae5ae794e 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.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/aac/decoder_aac.h b/src/plugins/Input/aac/decoder_aac.h index da1dee793..b98d5db45 100644 --- a/src/plugins/Input/aac/decoder_aac.h +++ b/src/plugins/Input/aac/decoder_aac.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 * @@ -44,11 +44,11 @@ public: return m_data; } // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: struct aac_data *m_data; diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 6ceca28ee..e69c4e9a3 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.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/aac/decoderaacfactory.h b/src/plugins/Input/aac/decoderaacfactory.h index fdaa1b5ba..815a38ce3 100644 --- a/src/plugins/Input/aac/decoderaacfactory.h +++ b/src/plugins/Input/aac/decoderaacfactory.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 * @@ -29,14 +29,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - 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); - 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 *) 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; }; #endif diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp index 8d10647ab..ef67a34a1 100644 --- a/src/plugins/Input/archive/archiveinputdevice.cpp +++ b/src/plugins/Input/archive/archiveinputdevice.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2018 by Ilya Kotov * + * Copyright (C) 2016-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/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h index e6c31fdda..18d8024d6 100644 --- a/src/plugins/Input/archive/archiveinputdevice.h +++ b/src/plugins/Input/archive/archiveinputdevice.h @@ -34,12 +34,12 @@ public: ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr); virtual ~ArchiveInputDevice(); - bool seek(qint64 pos); - qint64 size() const; + bool seek(qint64 pos) override; + qint64 size() const override; protected: - virtual qint64 readData(char *data, qint64 maxSize); - virtual qint64 writeData(const char *, qint64); + virtual qint64 readData(char *data, qint64 maxSize) override; + virtual qint64 writeData(const char *, qint64) override; private: struct archive *m_archive; diff --git a/src/plugins/Input/archive/archivetagreader.cpp b/src/plugins/Input/archive/archivetagreader.cpp index 14a7dc504..70820579e 100644 --- a/src/plugins/Input/archive/archivetagreader.cpp +++ b/src/plugins/Input/archive/archivetagreader.cpp @@ -36,7 +36,7 @@ public: virtual ~IODeviceStream() {} - virtual TagLib::FileName name() const + virtual TagLib::FileName name() const override { #ifdef Q_OS_WIN return QStringToFileName(m_fileName); @@ -44,26 +44,26 @@ public: return m_fileName.constData(); #endif } - virtual TagLib::ByteVector readBlock(unsigned long length) + virtual TagLib::ByteVector readBlock(unsigned long length) override { QByteArray data = m_input->read(length); return TagLib::ByteVector(data.constData(), data.size()); } - virtual void writeBlock(const TagLib::ByteVector &) + virtual void writeBlock(const TagLib::ByteVector &) override {} - virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long) + virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long) override {} - virtual void removeBlock(unsigned long, unsigned long) + virtual void removeBlock(unsigned long, unsigned long) override {} - virtual bool readOnly() const + virtual bool readOnly() const override { return true; } - virtual bool isOpen() const + virtual bool isOpen() const override { return m_input->isOpen(); } - virtual void seek(long offset, Position p = Beginning) + virtual void seek(long offset, Position p = Beginning) override { switch (p) { @@ -78,20 +78,20 @@ public: break; } } - virtual void clear() + virtual void clear() override { m_input->seek(0); TagLib::IOStream::clear(); } - virtual long tell() const + virtual long tell() const override { return m_input->pos(); } - virtual long length() + virtual long length() override { return m_input->size(); } - virtual void truncate(long) + virtual void truncate(long) override {} private: diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp index fa5bcf292..4ebdea9c6 100644 --- a/src/plugins/Input/archive/decoder_archive.cpp +++ b/src/plugins/Input/archive/decoder_archive.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2018 by Ilya Kotov * + * Copyright (C) 2016-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/archive/decoder_archive.h b/src/plugins/Input/archive/decoder_archive.h index 9356037b7..db79578b7 100644 --- a/src/plugins/Input/archive/decoder_archive.h +++ b/src/plugins/Input/archive/decoder_archive.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2018 by Ilya Kotov * + * Copyright (C) 2016-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,11 +34,11 @@ public: virtual ~DecoderArchive(); - bool initialize(); - qint64 totalTime() const; - void seek(qint64 time); - qint64 read(unsigned char *data, qint64 maxSize); - int bitrate() const; + bool initialize() override; + qint64 totalTime() const override; + void seek(qint64 time) override; + qint64 read(unsigned char *data, qint64 maxSize) override; + int bitrate() const override; private: QString m_url; diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 2b0f6ce25..3b83616c2 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2018 by Ilya Kotov * + * Copyright (C) 2016-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/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h index c9e708aff..0f29ee23d 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.h +++ b/src/plugins/Input/archive/decoderarchivefactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2018 by Ilya Kotov * + * Copyright (C) 2016-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,14 +30,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *) const; - DecoderProperties properties() const; - Decoder *create(const QString &url, QIODevice *); - 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 *) const override; + DecoderProperties properties() const override; + Decoder *create(const QString &url, QIODevice *) 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; }; #endif diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h index 84eb37cce..5da4c1ea7 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.h +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h @@ -52,11 +52,11 @@ public: static void clearTrackCache(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: //helper functions diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index f79ba96be..f861b8d22 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.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/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index b67d4df18..27723aec4 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.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 * @@ -29,14 +29,14 @@ class DecoderCDAudioFactory : public QObject, DecoderFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - 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); - 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 *) 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; }; #endif diff --git a/src/plugins/Input/cdaudio/settingsdialog.h b/src/plugins/Input/cdaudio/settingsdialog.h index ff784a6db..f2b036f16 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.h +++ b/src/plugins/Input/cdaudio/settingsdialog.h @@ -36,7 +36,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; void on_clearCacheButton_clicked(); private: diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp index f4904f09f..ee592af53 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.cpp +++ b/src/plugins/Input/cue/cuemetadatamodel.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/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h index 7aaad97f9..78ef36307 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.h +++ b/src/plugins/Input/cue/cuemetadatamodel.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 * @@ -30,8 +30,8 @@ class CUEMetaDataModel : public MetaDataModel public: CUEMetaDataModel(const QString &url); ~CUEMetaDataModel(); - QList<MetaDataItem> extraProperties() const; - QString coverPath() const; + QList<MetaDataItem> extraProperties() const override; + QString coverPath() const override; private: CUEParser *m_parser; diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index b50eda92d..08b0f804c 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.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/cue/cueparser.h b/src/plugins/Input/cue/cueparser.h index 5c0d24c8a..8d06fce0b 100644 --- a/src/plugins/Input/cue/cueparser.h +++ b/src/plugins/Input/cue/cueparser.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 * diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index ae7f06edc..e56b34683 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2017 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/cue/decoder_cue.h b/src/plugins/Input/cue/decoder_cue.h index 5bb87c469..3518ea039 100644 --- a/src/plugins/Input/cue/decoder_cue.h +++ b/src/plugins/Input/cue/decoder_cue.h @@ -35,13 +35,13 @@ public: virtual ~DecoderCUE(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - void seek(qint64); - qint64 read(unsigned char *data, qint64 size); - int bitrate() const; - const QString nextURL() const; - void next(); + bool initialize() override; + qint64 totalTime() const override; + void seek(qint64) override; + qint64 read(unsigned char *data, qint64 size) override; + int bitrate() const override; + const QString nextURL() const override; + void next() override; private: Decoder *m_decoder; diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 35d66e1dd..c6b3c4499 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.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/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h index 03dc25c00..eb782981a 100644 --- a/src/plugins/Input/cue/decodercuefactory.h +++ b/src/plugins/Input/cue/decodercuefactory.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 * @@ -31,14 +31,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &, QIODevice *); - QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths); - 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 *) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h index 158be59dd..4afae3380 100644 --- a/src/plugins/Input/cue/settingsdialog.h +++ b/src/plugins/Input/cue/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: void findCodecs(); diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 9548970fa..eeb61fb81 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.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/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index e824a4f7e..36a95d59f 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.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 * @@ -41,11 +41,11 @@ public: virtual ~DecoderFFmpeg(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: //helper functions diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index abca4bfb6..fe05461b0 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.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/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h index 60112ec2f..d0511cce9 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.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 * @@ -31,14 +31,14 @@ Q_INTERFACES(DecoderFactory) public: DecoderFFmpegFactory(); - bool canDecode(QIODevice *input) const; - 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); - 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 *) 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; }; #endif diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 17907d0cd..f60b7f79d 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.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/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h index 32f521e62..20d1f550e 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.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 * @@ -36,7 +36,7 @@ class FFmpegMetaDataModel : public MetaDataModel public: FFmpegMetaDataModel(const QString &path); ~FFmpegMetaDataModel(); - QPixmap cover() const; + QPixmap cover() const override; private: AVFormatContext *m_in; diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index b53122402..d42ff7068 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.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/ffmpeg/settingsdialog.h b/src/plugins/Input/ffmpeg/settingsdialog.h index 599c3481e..fa6a114cc 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.h +++ b/src/plugins/Input/ffmpeg/settingsdialog.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 * @@ -36,7 +36,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp index 405ce4d6a..3b02d1b7e 100644 --- a/src/plugins/Input/flac/cueparser.cpp +++ b/src/plugins/Input/flac/cueparser.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/flac/cueparser.h b/src/plugins/Input/flac/cueparser.h index e173aee58..12b2e7893 100644 --- a/src/plugins/Input/flac/cueparser.h +++ b/src/plugins/Input/flac/cueparser.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 * diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 0f2c14df2..4f515b080 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 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/flac/decoder_flac.h b/src/plugins/Input/flac/decoder_flac.h index 1771db2d8..b77fa7154 100644 --- a/src/plugins/Input/flac/decoder_flac.h +++ b/src/plugins/Input/flac/decoder_flac.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 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 * @@ -65,13 +65,13 @@ public: virtual ~DecoderFLAC(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *data, qint64 maxSize); - void seek(qint64 time); - const QString nextURL() const; - void next(); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *data, qint64 maxSize) override; + void seek(qint64 time) override; + const QString nextURL() const override; + void next() override; private: diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 28aec227a..74066316b 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.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/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h index 55b7dbb59..4a0ea0aca 100644 --- a/src/plugins/Input/flac/decoderflacfactory.h +++ b/src/plugins/Input/flac/decoderflacfactory.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_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - 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); - 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 *) override; + QList<TrackInfo*> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 0457d22ef..884c05502 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.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/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h index 66ed03164..440c490db 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.h +++ b/src/plugins/Input/flac/flacmetadatamodel.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 * @@ -36,12 +36,12 @@ class FLACMetaDataModel : public MetaDataModel public: FLACMetaDataModel(const QString &path, bool readOnly); ~FLACMetaDataModel(); - QList<TagModel* > tags() const; - QPixmap cover() const; - QString coverPath() const; + QList<TagModel* > tags() const override; + QPixmap cover() const override; + QString coverPath() const override; #ifdef HAS_PICTURE_LIST - void setCover(const QPixmap &pix); - void removeCover(); + void setCover(const QPixmap &pix) override; + void removeCover() override; #endif @@ -58,10 +58,10 @@ class VorbisCommentModel : public TagModel public: VorbisCommentModel(TagLib::Ogg::XiphComment *tag, TagLib::File *file); ~VorbisCommentModel(); - QString name() const; - QString value(Qmmp::MetaData key) const; - void setValue(Qmmp::MetaData key, const QString &value); - void save(); + QString name() const override; + QString value(Qmmp::MetaData key) const override; + void setValue(Qmmp::MetaData key, const QString &value) override; + void save() override; private: TagLib::File *m_file; diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp index 4de43f802..73d18bd68 100644 --- a/src/plugins/Input/gme/decoder_gme.cpp +++ b/src/plugins/Input/gme/decoder_gme.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-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/gme/decoder_gme.h b/src/plugins/Input/gme/decoder_gme.h index 730ec3c17..f6a3f2ff5 100644 --- a/src/plugins/Input/gme/decoder_gme.h +++ b/src/plugins/Input/gme/decoder_gme.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -36,11 +36,11 @@ public: virtual ~DecoderGme(); // 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: GmeHelper m_helper; diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index 50fee26a1..855650488 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-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/gme/decodergmefactory.h b/src/plugins/Input/gme/decodergmefactory.h index e02b504b9..1d364c792 100644 --- a/src/plugins/Input/gme/decodergmefactory.h +++ b/src/plugins/Input/gme/decodergmefactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,14 +32,14 @@ class DecoderGmeFactory : public QObject, DecoderFactory Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &path, QIODevice *input); - QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles); - 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 &path, QIODevice *input) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp index fad5274f5..223dfb1ad 100644 --- a/src/plugins/Input/gme/gmehelper.cpp +++ b/src/plugins/Input/gme/gmehelper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-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/gme/gmehelper.h b/src/plugins/Input/gme/gmehelper.h index 2908308e4..79ba57499 100644 --- a/src/plugins/Input/gme/gmehelper.h +++ b/src/plugins/Input/gme/gmehelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 by Ilya Kotov * + * Copyright (C) 2010-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/gme/settingsdialog.h b/src/plugins/Input/gme/settingsdialog.h index 5b4df41da..a84b955a1 100644 --- a/src/plugins/Input/gme/settingsdialog.h +++ b/src/plugins/Input/gme/settingsdialog.h @@ -36,7 +36,7 @@ public: ~SettingsDialog(); public slots: - void accept(); + void accept() override; private: Ui::SettingsDialog *m_ui; diff --git a/src/plugins/Input/modplug/decoder_modplug.h b/src/plugins/Input/modplug/decoder_modplug.h index ac80f7444..8797b2d59 100644 --- a/src/plugins/Input/modplug/decoder_modplug.h +++ b/src/plugins/Input/modplug/decoder_modplug.h @@ -34,11 +34,11 @@ public: void readSettings(); static DecoderModPlug* instance(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index b88b98e03..f4db5a065 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.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 * @@ -29,14 +29,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - 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); - 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 *) 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; }; #endif diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index 9d4248dd6..1ec8ddb04 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.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/modplug/modplugmetadatamodel.h b/src/plugins/Input/modplug/modplugmetadatamodel.h index 5568e6ee3..9f2c0e937 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.h +++ b/src/plugins/Input/modplug/modplugmetadatamodel.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 * @@ -31,8 +31,8 @@ class ModPlugMetaDataModel : public MetaDataModel public: ModPlugMetaDataModel(const QString &path); ~ModPlugMetaDataModel(); - QList<MetaDataItem> extraProperties() const; - QList<MetaDataItem> descriptions() const; + QList<MetaDataItem> extraProperties() const override; + QList<MetaDataItem> descriptions() const override; static QString getTypeName(quint32 type); private: diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 714ed0d89..badfe69d1 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.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/mpc/decoder_mpc.h b/src/plugins/Input/mpc/decoder_mpc.h index 4398b6dd0..a392b3006 100644 --- a/src/plugins/Input/mpc/decoder_mpc.h +++ b/src/plugins/Input/mpc/decoder_mpc.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 * @@ -43,11 +43,11 @@ public: } // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index da1e17bbb..4f430354a 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.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/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h index d8caeb9e4..8f28d988f 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.h +++ b/src/plugins/Input/mpc/decodermpcfactory.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 * @@ -29,14 +29,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &url, QIODevice *i); - 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 &url, QIODevice *i) 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; }; #endif diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index 3326bba6e..1db3a740f 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.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/mpc/mpcmetadatamodel.h b/src/plugins/Input/mpc/mpcmetadatamodel.h index a37c40142..834d63b64 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.h +++ b/src/plugins/Input/mpc/mpcmetadatamodel.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,7 +33,7 @@ class MPCMetaDataModel : public MetaDataModel public: MPCMetaDataModel(const QString &path, bool readOnly); ~MPCMetaDataModel(); - QList<TagModel* > tags() const; + QList<TagModel* > tags() const override; private: QList<TagModel* > m_tags; @@ -46,14 +46,14 @@ class MPCFileTagModel : public TagModel public: MPCFileTagModel(TagLib::MPC::File *file, TagLib::MPC::File::TagTypes tagType); ~MPCFileTagModel(); - 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: QTextCodec *m_codec; 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 * diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp index 92852afef..20631f3d3 100644 --- a/src/plugins/Input/opus/decoder_opus.cpp +++ b/src/plugins/Input/opus/decoder_opus.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/opus/decoder_opus.h b/src/plugins/Input/opus/decoder_opus.h index 8b0b02140..b31492938 100644 --- a/src/plugins/Input/opus/decoder_opus.h +++ b/src/plugins/Input/opus/decoder_opus.h @@ -34,13 +34,13 @@ public: virtual ~DecoderOpus(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; private: - virtual qint64 read(unsigned char *data, qint64 maxSize); - virtual void seek(qint64 time); + virtual qint64 read(unsigned char *data, qint64 maxSize) override; + virtual void seek(qint64 time) override; // helper functions ChannelMap findChannelMap(int channels); diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp index 95e913a36..8ef3770ac 100644 --- a/src/plugins/Input/opus/decoderopusfactory.cpp +++ b/src/plugins/Input/opus/decoderopusfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/opus/decoderopusfactory.h b/src/plugins/Input/opus/decoderopusfactory.h index 39a51bd83..850f03116 100644 --- a/src/plugins/Input/opus/decoderopusfactory.h +++ b/src/plugins/Input/opus/decoderopusfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,15 +33,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &path, QIODevice *input); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); - QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - QObject* showDetails(QWidget *parent, const QString &path); - 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 &path, QIODevice *input) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif //DECODEROPUSFACTORY_H diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp index 4cea1422e..a28f88154 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h index 44afc88a5..a4c559c74 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.h +++ b/src/plugins/Input/opus/opusmetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -36,12 +36,12 @@ class OpusMetaDataModel : public MetaDataModel public: OpusMetaDataModel(const QString &path, bool readOnly); ~OpusMetaDataModel(); - QList<MetaDataItem> extraProperties() const; - QList<TagModel* > tags() const; - QPixmap cover() const; + QList<MetaDataItem> extraProperties() const override; + QList<TagModel* > tags() const override; + QPixmap cover() const override; #ifdef HAS_PICTURE_LIST - void setCover(const QPixmap &pix); - void removeCover(); + void setCover(const QPixmap &pix) override; + void removeCover() override; #endif private: @@ -56,10 +56,10 @@ class VorbisCommentModel : public TagModel public: VorbisCommentModel(TagLib::Ogg::Opus::File *file); ~VorbisCommentModel(); - QString name() const; - QString value(Qmmp::MetaData key) const; - void setValue(Qmmp::MetaData key, const QString &value); - void save(); + QString name() const override; + QString value(Qmmp::MetaData key) const override; + void setValue(Qmmp::MetaData key, const QString &value) override; + void save() override; private: TagLib::Ogg::Opus::File *m_file; diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp index 889c762d3..54af8f14f 100644 --- a/src/plugins/Input/sid/decoder_sid.cpp +++ b/src/plugins/Input/sid/decoder_sid.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-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/sid/decoder_sid.h b/src/plugins/Input/sid/decoder_sid.h index 359000a96..991d9117a 100644 --- a/src/plugins/Input/sid/decoder_sid.h +++ b/src/plugins/Input/sid/decoder_sid.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -37,11 +37,11 @@ public: virtual ~DecoderSID(); // 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: QString m_url; diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index c30c7ff6b..7c59e0f24 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/sid/decodersidfactory.h b/src/plugins/Input/sid/decodersidfactory.h index f7f275acf..8fd5b5881 100644 --- a/src/plugins/Input/sid/decodersidfactory.h +++ b/src/plugins/Input/sid/decodersidfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -36,14 +36,14 @@ class DecoderSIDFactory : public QObject, DecoderFactory public: DecoderSIDFactory(); - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &path, 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 &path, 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: SidDatabase m_db; diff --git a/src/plugins/Input/sid/settingsdialog.h b/src/plugins/Input/sid/settingsdialog.h index 01f784692..42a501176 100644 --- a/src/plugins/Input/sid/settingsdialog.h +++ b/src/plugins/Input/sid/settingsdialog.h @@ -36,7 +36,7 @@ public: virtual ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp index 9700b671f..3f6401671 100644 --- a/src/plugins/Input/sid/sidhelper.cpp +++ b/src/plugins/Input/sid/sidhelper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/sid/sidhelper.h b/src/plugins/Input/sid/sidhelper.h index 4e9d41c9f..27d90a071 100644 --- a/src/plugins/Input/sid/sidhelper.h +++ b/src/plugins/Input/sid/sidhelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 by Ilya Kotov * + * Copyright (C) 2013-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/sndfile/decoder_sndfile.h b/src/plugins/Input/sndfile/decoder_sndfile.h index ce53b74ae..d202ad546 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.h +++ b/src/plugins/Input/sndfile/decoder_sndfile.h @@ -36,11 +36,11 @@ public: virtual ~DecoderSndFile(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *audio, qint64 maxSize) override; + void seek(qint64 time) override; private: diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 23084bb63..f6d2f221f 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 by Ilya Kotov * + * Copyright (C) 2007-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/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h index 205e0d668..0d6c2c3d7 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.h +++ b/src/plugins/Input/sndfile/decodersndfilefactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,14 +30,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - 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); - 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 *) 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; }; #endif diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h index 95065522b..8f23236c4 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.h +++ b/src/plugins/Input/vorbis/decoder_vorbis.h @@ -19,13 +19,13 @@ public: virtual ~DecoderVorbis(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; private: - virtual qint64 read(unsigned char *data, qint64 maxSize); - virtual void seek(qint64 time); + virtual qint64 read(unsigned char *data, qint64 maxSize) override; + virtual void seek(qint64 time) override; // helper functions void deinit(); diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 1ac62a020..e8c5819cc 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.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/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h index 9b2908a96..14a9e5791 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.h +++ b/src/plugins/Input/vorbis/decodervorbisfactory.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 * @@ -33,15 +33,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &, QIODevice *input); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); - QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - QObject* showDetails(QWidget *parent, const QString &path); - 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; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index e800eb045..8ece55ceb 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.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/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index 2f87e9b3e..00f256da6 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.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 * @@ -40,11 +40,11 @@ public: ~VorbisMetaDataModel(); friend class VorbisCommentModel; - QList<TagModel* > tags() const; - QPixmap cover() const; + QList<TagModel* > tags() const override; + QPixmap cover() const override; #ifdef HAS_PICTURE_LIST - void setCover(const QPixmap &pix); - void removeCover(); + void setCover(const QPixmap &pix) override; + void removeCover() override; #endif private: @@ -60,10 +60,10 @@ class VorbisCommentModel : public TagModel public: VorbisCommentModel(VorbisMetaDataModel *model); ~VorbisCommentModel(); - QString name() const; - QString value(Qmmp::MetaData key) const; - void setValue(Qmmp::MetaData key, const QString &value); - void save(); + QString name() const override; + QString value(Qmmp::MetaData key) const override; + void setValue(Qmmp::MetaData key, const QString &value) override; + void save() override; private: VorbisMetaDataModel *m_model; diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp index ecfb2c9d6..0dddc3354 100644 --- a/src/plugins/Input/wavpack/cueparser.cpp +++ b/src/plugins/Input/wavpack/cueparser.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/wavpack/cueparser.h b/src/plugins/Input/wavpack/cueparser.h index e173aee58..12b2e7893 100644 --- a/src/plugins/Input/wavpack/cueparser.h +++ b/src/plugins/Input/wavpack/cueparser.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 * diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 5ca7a1c50..3b6da3de9 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.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/wavpack/decoder_wavpack.h b/src/plugins/Input/wavpack/decoder_wavpack.h index 923d902dc..c4f937478 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.h +++ b/src/plugins/Input/wavpack/decoder_wavpack.h @@ -35,13 +35,13 @@ public: virtual ~DecoderWavPack(); // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *data, qint64 maxSize); - void seek(qint64 time); - const QString nextURL() const; - void next(); + bool initialize() override; + qint64 totalTime() const override; + int bitrate() const override; + qint64 read(unsigned char *data, qint64 maxSize) override; + void seek(qint64 time) override; + const QString nextURL() const override; + void next() override; private: // helper functions diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 139fe7494..3c4b8e1bd 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.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/wavpack/decoderwavpackfactory.h b/src/plugins/Input/wavpack/decoderwavpackfactory.h index ce4638144..457ca9298 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.h +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.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 * @@ -30,14 +30,14 @@ class DecoderWavPackFactory : public QObject, Q_INTERFACES(DecoderFactory) public: - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &p, QIODevice *i); - QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles); - 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 &p, QIODevice *i) override; + QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles) override; + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index e4b8a9016..53d1d798a 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.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/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h index 8338b0645..8e4b79313 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.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 * @@ -32,9 +32,9 @@ class WavPackMetaDataModel : public MetaDataModel public: WavPackMetaDataModel(const QString &path, bool readOnly); ~WavPackMetaDataModel(); - QList<MetaDataItem> extraProperties() const; - QList<TagModel* > tags() const; - QString coverPath() const; + QList<MetaDataItem> extraProperties() const override; + QList<TagModel* > tags() const override; + QString coverPath() const override; private: WavpackContext *m_ctx; @@ -47,10 +47,10 @@ class WavPackFileTagModel : public TagModel public: WavPackFileTagModel(WavpackContext *ctx); ~WavPackFileTagModel(); - QString name() const; - QString value(Qmmp::MetaData key) const; - void setValue(Qmmp::MetaData key, const QString &value); - void save(); + QString name() const override; + QString value(Qmmp::MetaData key) const override; + void setValue(Qmmp::MetaData key, const QString &value) override; + void save() override; private: WavpackContext *m_ctx; diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.h b/src/plugins/Input/wildmidi/decoder_wildmidi.h index cc785e3ce..0f2ded8c4 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.h +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.h @@ -33,11 +33,11 @@ public: virtual ~DecoderWildMidi(); // 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: void *midi_ptr; diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index 540846af5..4b765a939 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.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/wildmidi/decoderwildmidifactory.h b/src/plugins/Input/wildmidi/decoderwildmidifactory.h index e604060f2..a811da0cd 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.h +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.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 * @@ -30,14 +30,14 @@ class DecoderWildMidiFactory : public QObject, DecoderFactory public: DecoderWildMidiFactory(); - bool canDecode(QIODevice *input) const; - DecoderProperties properties() const; - Decoder *create(const QString &path, 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 &path, 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; }; #endif diff --git a/src/plugins/Input/wildmidi/settingsdialog.h b/src/plugins/Input/wildmidi/settingsdialog.h index d190ebe7d..9fd0d62e7 100644 --- a/src/plugins/Input/wildmidi/settingsdialog.h +++ b/src/plugins/Input/wildmidi/settingsdialog.h @@ -36,7 +36,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; |