From 8a6f982632b4f4710576685a5647a771384ab29a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 6 Jan 2019 19:27:03 +0000 Subject: using override keyword git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/vorbis/decoder_vorbis.h | 10 +++++----- src/plugins/Input/vorbis/decodervorbisfactory.cpp | 2 +- src/plugins/Input/vorbis/decodervorbisfactory.h | 19 +++++++++---------- src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 2 +- src/plugins/Input/vorbis/vorbismetadatamodel.h | 18 +++++++++--------- 5 files changed, 25 insertions(+), 26 deletions(-) (limited to 'src/plugins/Input/vorbis') 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 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 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 tags() const; - QPixmap cover() const; + QList 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; -- cgit v1.2.3-13-gbd6f