diff options
Diffstat (limited to 'src/plugins')
384 files changed, 1182 insertions, 1185 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h index c2bd683cf..5fb0ea6f9 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h @@ -34,10 +34,10 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0") Q_INTERFACES(CommandLineHandler) public: - void registerOprions(); - QString shortName() const; - QString translation() const; - QString executeCommand(int id, const QStringList &args); + void registerOprions() override; + QString shortName() const override; + QString translation() const override; + QString executeCommand(int id, const QStringList &args) override; private: enum Command diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h index b4181e7aa..d79c63521 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h @@ -36,10 +36,10 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0") Q_INTERFACES(CommandLineHandler) public: - void registerOprions(); - QString shortName() const; - QString translation() const; - QString executeCommand(int id, const QStringList &args); + void registerOprions() override; + QString shortName() const override; + QString translation() const override; + QString executeCommand(int id, const QStringList &args) override; private: enum Command diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h index f3fddb9ee..decd5cf0a 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h @@ -34,10 +34,10 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0") Q_INTERFACES(CommandLineHandler) public: - void registerOprions(); - QString shortName() const; - QString translation() const; - QString executeCommand(int id, const QStringList &args); + void registerOprions() override; + QString shortName() const override; + QString translation() const override; + QString executeCommand(int id, const QStringList &args) override; private: enum Command diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h index ebe933899..a84704de1 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h @@ -36,10 +36,10 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0") Q_INTERFACES(CommandLineHandler) public: - void registerOprions(); - QString shortName() const; - QString translation() const; - QString executeCommand(int id, const QStringList &args); + void registerOprions() override; + QString shortName() const override; + QString translation() const override; + QString executeCommand(int id, const QStringList &args) override; private: enum Commamnd diff --git a/src/plugins/Effect/bs2b/bs2bplugin.h b/src/plugins/Effect/bs2b/bs2bplugin.h index 6128f6f1a..c75256fee 100644 --- a/src/plugins/Effect/bs2b/bs2bplugin.h +++ b/src/plugins/Effect/bs2b/bs2bplugin.h @@ -35,8 +35,8 @@ public: virtual ~Bs2bPlugin(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; void setCrossfeedLevel(uint32_t level); static Bs2bPlugin* instance(); diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.h b/src/plugins/Effect/bs2b/effectbs2bfactory.h index 49644a68b..c68f2d725 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.h +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/bs2b/settingsdialog.h b/src/plugins/Effect/bs2b/settingsdialog.h index 7b1128df5..f814985f0 100644 --- a/src/plugins/Effect/bs2b/settingsdialog.h +++ b/src/plugins/Effect/bs2b/settingsdialog.h @@ -36,8 +36,8 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); - virtual void reject(); + virtual void accept() override; + virtual void reject() override; private slots: void on_freqSlider_valueChanged (int value); diff --git a/src/plugins/Effect/crossfade/crossfadeplugin.h b/src/plugins/Effect/crossfade/crossfadeplugin.h index 3d877621b..9ff1715fa 100644 --- a/src/plugins/Effect/crossfade/crossfadeplugin.h +++ b/src/plugins/Effect/crossfade/crossfadeplugin.h @@ -38,8 +38,8 @@ public: virtual ~CrossfadePlugin(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; private: enum State diff --git a/src/plugins/Effect/crossfade/effectcrossfadefactory.h b/src/plugins/Effect/crossfade/effectcrossfadefactory.h index 8fd23e5c0..fd46874b2 100644 --- a/src/plugins/Effect/crossfade/effectcrossfadefactory.h +++ b/src/plugins/Effect/crossfade/effectcrossfadefactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/crossfade/settingsdialog.h b/src/plugins/Effect/crossfade/settingsdialog.h index 40a8a4a87..0fae41c24 100644 --- a/src/plugins/Effect/crossfade/settingsdialog.h +++ b/src/plugins/Effect/crossfade/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog ui; diff --git a/src/plugins/Effect/filewriter/effectfilewriterfactory.h b/src/plugins/Effect/filewriter/effectfilewriterfactory.h index 266f72606..c9df27acd 100644 --- a/src/plugins/Effect/filewriter/effectfilewriterfactory.h +++ b/src/plugins/Effect/filewriter/effectfilewriterfactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/filewriter/filewriterplugin.h b/src/plugins/Effect/filewriter/filewriterplugin.h index 1ec1174bd..92ce91008 100644 --- a/src/plugins/Effect/filewriter/filewriterplugin.h +++ b/src/plugins/Effect/filewriter/filewriterplugin.h @@ -33,8 +33,8 @@ public: FileWriterPlugin(); virtual ~FileWriterPlugin(); - void configure(quint32 srate, ChannelMap map); - void applyEffect(Buffer *b); + void configure(quint32 srate, ChannelMap map) override; + void applyEffect(Buffer *b) override; private: void init(const TrackInfo &info); diff --git a/src/plugins/Effect/filewriter/settingsdialog.h b/src/plugins/Effect/filewriter/settingsdialog.h index 8902ba2bf..3a8bed829 100644 --- a/src/plugins/Effect/filewriter/settingsdialog.h +++ b/src/plugins/Effect/filewriter/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void addTitleString(const QString &str); diff --git a/src/plugins/Effect/ladspa/effectladspafactory.h b/src/plugins/Effect/ladspa/effectladspafactory.h index 62e8b589c..bd2391f09 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.h +++ b/src/plugins/Effect/ladspa/effectladspafactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/ladspa/ladspahelper.h b/src/plugins/Effect/ladspa/ladspahelper.h index df50907ec..3aaba1f59 100644 --- a/src/plugins/Effect/ladspa/ladspahelper.h +++ b/src/plugins/Effect/ladspa/ladspahelper.h @@ -32,8 +32,8 @@ public: LADSPAHelper(); virtual ~LADSPAHelper(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; }; #endif // LADSPAHELPER_H diff --git a/src/plugins/Effect/ladspa/settingsdialog.h b/src/plugins/Effect/ladspa/settingsdialog.h index 3fb9eb94a..0ba6fbb91 100644 --- a/src/plugins/Effect/ladspa/settingsdialog.h +++ b/src/plugins/Effect/ladspa/settingsdialog.h @@ -40,7 +40,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_loadButton_clicked(); diff --git a/src/plugins/Effect/monotostereo/effectmonotostereofactory.cpp b/src/plugins/Effect/monotostereo/effectmonotostereofactory.cpp index 6bae99ddd..56b0d9851 100644 --- a/src/plugins/Effect/monotostereo/effectmonotostereofactory.cpp +++ b/src/plugins/Effect/monotostereo/effectmonotostereofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Effect/monotostereo/effectmonotostereofactory.h b/src/plugins/Effect/monotostereo/effectmonotostereofactory.h index ee1ddc9f1..ca0a6edf6 100644 --- a/src/plugins/Effect/monotostereo/effectmonotostereofactory.h +++ b/src/plugins/Effect/monotostereo/effectmonotostereofactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/monotostereo/monotostereoplugin.cpp b/src/plugins/Effect/monotostereo/monotostereoplugin.cpp index 7a852bd0e..ec9fc15f5 100644 --- a/src/plugins/Effect/monotostereo/monotostereoplugin.cpp +++ b/src/plugins/Effect/monotostereo/monotostereoplugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Effect/monotostereo/monotostereoplugin.h b/src/plugins/Effect/monotostereo/monotostereoplugin.h index a3a92f2d1..cd9c8f109 100644 --- a/src/plugins/Effect/monotostereo/monotostereoplugin.h +++ b/src/plugins/Effect/monotostereo/monotostereoplugin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,8 +33,8 @@ public: virtual ~MonoToStereoPlugin(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; private: bool m_enabled; diff --git a/src/plugins/Effect/soxr/effectsoxrfactory.h b/src/plugins/Effect/soxr/effectsoxrfactory.h index 5300336d6..11248491b 100644 --- a/src/plugins/Effect/soxr/effectsoxrfactory.h +++ b/src/plugins/Effect/soxr/effectsoxrfactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/soxr/settingsdialog.h b/src/plugins/Effect/soxr/settingsdialog.h index ce0979b36..6a78c4fff 100644 --- a/src/plugins/Effect/soxr/settingsdialog.h +++ b/src/plugins/Effect/soxr/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/Effect/soxr/soxresampler.h b/src/plugins/Effect/soxr/soxresampler.h index 9b950825d..09e159837 100644 --- a/src/plugins/Effect/soxr/soxresampler.h +++ b/src/plugins/Effect/soxr/soxresampler.h @@ -33,8 +33,8 @@ public: SoXResampler(); virtual ~SoXResampler(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; private: void freeSoXR(); diff --git a/src/plugins/Effect/stereo/effectstereofactory.cpp b/src/plugins/Effect/stereo/effectstereofactory.cpp index 5e75b080e..78ae6f76c 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.cpp +++ b/src/plugins/Effect/stereo/effectstereofactory.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/Effect/stereo/effectstereofactory.h b/src/plugins/Effect/stereo/effectstereofactory.h index abf141597..55b8714f9 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.h +++ b/src/plugins/Effect/stereo/effectstereofactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: - const EffectProperties properties() const; - Effect *create(); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + const EffectProperties properties() const override; + Effect *create() override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Effect/stereo/settingsdialog.h b/src/plugins/Effect/stereo/settingsdialog.h index f637430f9..2cf568a61 100644 --- a/src/plugins/Effect/stereo/settingsdialog.h +++ b/src/plugins/Effect/stereo/settingsdialog.h @@ -35,8 +35,8 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); - virtual void reject(); + virtual void accept() override; + virtual void reject() override; private slots: void on_intensitySlider_valueChanged (int value); diff --git a/src/plugins/Effect/stereo/stereoplugin.h b/src/plugins/Effect/stereo/stereoplugin.h index 085405654..f24b3a02a 100644 --- a/src/plugins/Effect/stereo/stereoplugin.h +++ b/src/plugins/Effect/stereo/stereoplugin.h @@ -33,8 +33,8 @@ public: virtual ~StereoPlugin(); - void applyEffect(Buffer *b); - void configure(quint32 freq, ChannelMap map); + void applyEffect(Buffer *b) override; + void configure(quint32 freq, ChannelMap map) override; void setIntensity(double level); static StereoPlugin* instance(); diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index 4b1741b0d..418b3fcba 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.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/Engines/mplayer/mplayerengine.h b/src/plugins/Engines/mplayer/mplayerengine.h index c7c16cad9..0b890e3f5 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.h +++ b/src/plugins/Engines/mplayer/mplayerengine.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 * @@ -49,13 +49,13 @@ public: virtual ~MplayerEngine(); // Engine API - bool play(); - bool enqueue(InputSource *source); + bool play() override; + bool enqueue(InputSource *source) override; bool initialize(); - void seek(qint64); - void stop(); - void pause(); - void setMuted(bool muted); + void seek(qint64) override; + void stop() override; + void pause() override; + void setMuted(bool muted) override; private slots: void readStdOut(); diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index edd84ba03..ec20eb867 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.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/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h index d57081d0e..ec4188dca 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.h +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.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.EngineFactoryInterface.1.0") Q_INTERFACES(EngineFactory) public: - EngineProperties properties() const; - bool supports(const QString &source) const; - AbstractEngine *create(QObject *parent = nullptr); - 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; + EngineProperties properties() const override; + bool supports(const QString &source) const override; + AbstractEngine *create(QObject *parent = nullptr) 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/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp index 37ec54c93..a114424e8 100644 --- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp +++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.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/Engines/mplayer/mplayermetadatamodel.h b/src/plugins/Engines/mplayer/mplayermetadatamodel.h index c0121a6eb..cec0c10bb 100644 --- a/src/plugins/Engines/mplayer/mplayermetadatamodel.h +++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.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,7 +29,7 @@ class MplayerMetaDataModel : public MetaDataModel public: MplayerMetaDataModel(const QString &path); ~MplayerMetaDataModel(); - QList<MetaDataItem> extraProperties() const; + QList<MetaDataItem> extraProperties() const override; private: QString m_path; diff --git a/src/plugins/Engines/mplayer/settingsdialog.h b/src/plugins/Engines/mplayer/settingsdialog.h index 902e55f63..fc4fb900c 100644 --- a/src/plugins/Engines/mplayer/settingsdialog.h +++ b/src/plugins/Engines/mplayer/settingsdialog.h @@ -36,7 +36,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h index 72b283083..5f3124b3f 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h @@ -34,10 +34,10 @@ public: protected: void raise(const QString &dir, Mode mode, const QString &caption, - const QStringList &mask); + const QStringList &mask) override; QStringList exec(QWidget *parent, const QString &dir, Mode mode, - const QString &caption, const QString &filter, QString *); + const QString &caption, const QString &filter, QString *) override; private: QmmpFileDialogImpl *m_dialog; @@ -50,10 +50,10 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.FileDialogFactoryInterface.1.0") Q_INTERFACES(FileDialogFactory) public: - virtual FileDialog* create(); - virtual FileDialogProperties properties() const; - virtual void showAbout(QWidget*); - virtual QString translation() const; + virtual FileDialog* create() override; + virtual FileDialogProperties properties() const override; + virtual void showAbout(QWidget*) override; + virtual QString translation() const override; virtual ~QmmpFileDialogFactory() { ; diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h index 60fe51d85..fbbdc1ccc 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h @@ -58,7 +58,7 @@ signals: void filesSelected(const QStringList&, bool play = false); protected: - virtual void hideEvent (QHideEvent *event); + virtual void hideEvent (QHideEvent *event) override; private slots: void updateSelection (); @@ -79,10 +79,10 @@ public: PathCompleter(QAbstractItemModel *model, QAbstractItemView *itemView, QObject *parent = nullptr) : QCompleter(model, parent) { m_itemView = itemView; - }; + } - QString pathFromIndex(const QModelIndex &index) const + QString pathFromIndex(const QModelIndex &index) const override { const QFileSystemModel *dirModel = static_cast<const QFileSystemModel *>(model()); QString currentLocation = dirModel->filePath(m_itemView->rootIndex()); @@ -95,7 +95,7 @@ public: } - QStringList splitPath(const QString &path) const + QStringList splitPath(const QString &path) const override { if (path.isEmpty()) return QStringList(completionPrefix()); diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h index 608af1e8b..ce96d3551 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h @@ -38,10 +38,10 @@ public: protected: void raise(const QString &dir, Mode mode, const QString &caption, - const QStringList &mask); + const QStringList &mask) override; QStringList exec(QWidget *parent, const QString &dir, Mode mode, - const QString &caption, const QString &filter, QString *); + const QString &caption, const QString &filter, QString *) override; private: @@ -57,10 +57,10 @@ class TwoPanelFileDialogFactory : public QObject, public FileDialogFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.FileDialogFactoryInterface.1.0") Q_INTERFACES(FileDialogFactory) public: - FileDialog* create(); - FileDialogProperties properties() const; - void showAbout(QWidget*); - QString translation() const; + FileDialog* create() override; + FileDialogProperties properties() const override; + void showAbout(QWidget*) override; + QString translation() const override; }; diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h index 09f3c0e5f..4b7b8ae73 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h @@ -58,7 +58,7 @@ private slots: private: void updateFileList(const QString &path); - void hideEvent (QHideEvent *event); + void hideEvent (QHideEvent *event) override; void addToHistory(const QString &path); void addFiles(const QStringList &list, bool play); @@ -78,7 +78,7 @@ public: m_itemView = itemView; } - QString pathFromIndex(const QModelIndex &index) const + QString pathFromIndex(const QModelIndex &index) const override { const QFileSystemModel *fileModel = static_cast<const QFileSystemModel *>(model()); QString currentLocation = fileModel->filePath(m_itemView->rootIndex()); @@ -91,7 +91,7 @@ public: } - QStringList splitPath(const QString &path) const + QStringList splitPath(const QString &path) const override { if (path.isEmpty()) return QStringList(completionPrefix()); diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index b4e693211..2615a3ec0 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.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/General/converter/converter.h b/src/plugins/General/converter/converter.h index f35a4251c..482315d55 100644 --- a/src/plugins/General/converter/converter.h +++ b/src/plugins/General/converter/converter.h @@ -52,7 +52,7 @@ signals: void message(int row, QString message); private: - void run(); + void run() override; bool convert(Decoder *decoder, FILE *file, bool use16bit); Decoder *m_decoder; InputSource *m_input; diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp index 8fdb9390b..fc4916c7d 100644 --- a/src/plugins/General/converter/converterdialog.cpp +++ b/src/plugins/General/converter/converterdialog.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/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h index 6bc6f066e..e1d7dd2c1 100644 --- a/src/plugins/General/converter/converterdialog.h +++ b/src/plugins/General/converter/converterdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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 * @@ -41,7 +41,7 @@ public: virtual ~ConverterDialog(); public slots: - virtual void reject(); + virtual void reject() override; private slots: void on_dirButton_clicked(); diff --git a/src/plugins/General/converter/converterfactory.h b/src/plugins/General/converter/converterfactory.h index 280a9825c..11c2a194f 100644 --- a/src/plugins/General/converter/converterfactory.h +++ b/src/plugins/General/converter/converterfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp index 9414dcb23..e3401d5aa 100644 --- a/src/plugins/General/copypaste/copypaste.cpp +++ b/src/plugins/General/copypaste/copypaste.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/General/copypaste/copypastefactory.h b/src/plugins/General/copypaste/copypastefactory.h index 20bb61a6c..b5b3f629e 100644 --- a/src/plugins/General/copypaste/copypastefactory.h +++ b/src/plugins/General/copypaste/copypastefactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif // COPYPASTEFACTORY_H diff --git a/src/plugins/General/covermanager/covermanagerfactory.h b/src/plugins/General/covermanager/covermanagerfactory.h index b4d838cf9..9e60216c7 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.h +++ b/src/plugins/General/covermanager/covermanagerfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/covermanager/coverwidget.h b/src/plugins/General/covermanager/coverwidget.h index 55ee9a2eb..535d781dc 100644 --- a/src/plugins/General/covermanager/coverwidget.h +++ b/src/plugins/General/covermanager/coverwidget.h @@ -41,8 +41,8 @@ public: virtual void setPixmap(const QPixmap&); protected: - void paintEvent (QPaintEvent *event); - void mousePressEvent (QMouseEvent * event); + void paintEvent (QPaintEvent *event) override; + void mousePressEvent (QMouseEvent * event) override; private slots: void saveAs(); diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp index 1a57c54a1..16058fdc9 100644 --- a/src/plugins/General/fileops/fileops.cpp +++ b/src/plugins/General/fileops/fileops.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/General/fileops/fileopsfactory.h b/src/plugins/General/fileops/fileopsfactory.h index 1a6deef94..6eb23cd95 100644 --- a/src/plugins/General/fileops/fileopsfactory.h +++ b/src/plugins/General/fileops/fileopsfactory.h @@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/fileops/hotkeydialog.h b/src/plugins/General/fileops/hotkeydialog.h index d68da11b6..bf37bfea1 100644 --- a/src/plugins/General/fileops/hotkeydialog.h +++ b/src/plugins/General/fileops/hotkeydialog.h @@ -40,7 +40,7 @@ public: const QString key(); protected: - virtual void keyPressEvent (QKeyEvent *event); + virtual void keyPressEvent (QKeyEvent *event) override; private: Ui::HotkeyDialog ui; diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp index 2431a8ba2..4d4913eb3 100644 --- a/src/plugins/General/fileops/settingsdialog.cpp +++ b/src/plugins/General/fileops/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/General/fileops/settingsdialog.h b/src/plugins/General/fileops/settingsdialog.h index 41f4e4575..279c008cc 100644 --- a/src/plugins/General/fileops/settingsdialog.h +++ b/src/plugins/General/fileops/settingsdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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 * @@ -38,7 +38,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_newButton_clicked(); diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h index d119143b0..fd47b595b 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/hal/halfactory.h b/src/plugins/General/hal/halfactory.h index 195b3c42c..1b5d7e6fc 100644 --- a/src/plugins/General/hal/halfactory.h +++ b/src/plugins/General/hal/halfactory.h @@ -33,11 +33,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp index d3477fec9..5b795d3d5 100644 --- a/src/plugins/General/hal/halplugin.cpp +++ b/src/plugins/General/hal/halplugin.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/General/hal/settingsdialog.h b/src/plugins/General/hal/settingsdialog.h index 604483326..99555d022 100644 --- a/src/plugins/General/hal/settingsdialog.h +++ b/src/plugins/General/hal/settingsdialog.h @@ -37,7 +37,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog ui; diff --git a/src/plugins/General/history/history.cpp b/src/plugins/General/history/history.cpp index 25b4bf8fe..a4a721ea9 100644 --- a/src/plugins/General/history/history.cpp +++ b/src/plugins/General/history/history.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/history/history.h b/src/plugins/General/history/history.h index d044bc0ae..1b0ff2163 100644 --- a/src/plugins/General/history/history.h +++ b/src/plugins/General/history/history.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/history/historyfactory.h b/src/plugins/General/history/historyfactory.h index 5a5e9ed77..edd6d7e9d 100644 --- a/src/plugins/General/history/historyfactory.h +++ b/src/plugins/General/history/historyfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif // HISTORYFACTORY_H diff --git a/src/plugins/General/history/historysettingsdialog.h b/src/plugins/General/history/historysettingsdialog.h index f9efef1b5..7b842b45a 100644 --- a/src/plugins/General/history/historysettingsdialog.h +++ b/src/plugins/General/history/historysettingsdialog.h @@ -36,7 +36,7 @@ public: ~HistorySettingsDialog(); public slots: - void accept(); + void accept() override; private slots: void addTitleString(const QString &str); diff --git a/src/plugins/General/history/historywindow.cpp b/src/plugins/General/history/historywindow.cpp index 34de9b5bc..cbba39987 100644 --- a/src/plugins/General/history/historywindow.cpp +++ b/src/plugins/General/history/historywindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/history/historywindow.h b/src/plugins/General/history/historywindow.h index 88d81e887..c1097884f 100644 --- a/src/plugins/General/history/historywindow.h +++ b/src/plugins/General/history/historywindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -53,7 +53,7 @@ private: void loadTopArtists(); void loadTopGenres(); void readSettings(); - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; Ui::HistoryWindow *m_ui; QSqlDatabase m_db; diff --git a/src/plugins/General/history/progressbaritemdelegate.h b/src/plugins/General/history/progressbaritemdelegate.h index 2eef87b91..526329f2c 100644 --- a/src/plugins/General/history/progressbaritemdelegate.h +++ b/src/plugins/General/history/progressbaritemdelegate.h @@ -37,8 +37,8 @@ class ProgressBarItemDelegate : public QStyledItemDelegate public: explicit ProgressBarItemDelegate(QObject *parent = nullptr); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; bool hasProgressBar(const QModelIndex &index) const; }; diff --git a/src/plugins/General/hotkey/hotkeydialog.cpp b/src/plugins/General/hotkey/hotkeydialog.cpp index 45a3c3e39..e522acc77 100644 --- a/src/plugins/General/hotkey/hotkeydialog.cpp +++ b/src/plugins/General/hotkey/hotkeydialog.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/General/hotkey/hotkeydialog.h b/src/plugins/General/hotkey/hotkeydialog.h index 4bae2d01b..d3de06a06 100644 --- a/src/plugins/General/hotkey/hotkeydialog.h +++ b/src/plugins/General/hotkey/hotkeydialog.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 * @@ -41,12 +41,12 @@ public: quint32 keySym () const; public slots: - void accept(); - void reject(); + void accept() override; + void reject() override; private: - void keyPressEvent (QKeyEvent *event); - void showEvent(QShowEvent *); + void keyPressEvent (QKeyEvent *event) override; + void showEvent(QShowEvent *) override; Ui::HotkeyDialog m_ui; quint32 m_key, m_modifiers; diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index ff74a5cfe..db1ccb7b3 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.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/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index 2bd998f5f..7cee2dbd4 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.h @@ -33,11 +33,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index 45692cf1e..1e97294fb 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.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 * @@ -79,7 +79,7 @@ public: static quint32 keycodeToKeysym(quint32 keycode); private: - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; QList <Hotkey *> m_grabbedKeys; }; diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp index 5dd8632f3..aa0cdd6b5 100644 --- a/src/plugins/General/hotkey/hotkeymanager_win.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_win.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/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 4775102df..016f132ba 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin * diff --git a/src/plugins/General/hotkey/settingsdialog.h b/src/plugins/General/hotkey/settingsdialog.h index da947e681..f313e5430 100644 --- a/src/plugins/General/hotkey/settingsdialog.h +++ b/src/plugins/General/hotkey/settingsdialog.h @@ -38,7 +38,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_tableWidget_itemDoubleClicked (QTableWidgetItem * item); diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h index 9d4e76c57..8c6ce684b 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.h +++ b/src/plugins/General/kdenotify/kdenotifyfactory.h @@ -33,11 +33,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif // KDENOTIFYFACTORY_H diff --git a/src/plugins/General/kdenotify/settingsdialog.h b/src/plugins/General/kdenotify/settingsdialog.h index 835a39ad0..fb15f50ad 100644 --- a/src/plugins/General/kdenotify/settingsdialog.h +++ b/src/plugins/General/kdenotify/settingsdialog.h @@ -36,13 +36,13 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: virtual void on_templateButton_clicked(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: Ui::SettingsDialog *ui; diff --git a/src/plugins/General/lyrics/lyricsfactory.h b/src/plugins/General/lyrics/lyricsfactory.h index c968329bd..0c3d32da4 100644 --- a/src/plugins/General/lyrics/lyricsfactory.h +++ b/src/plugins/General/lyrics/lyricsfactory.h @@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index fa26ca049..1b23bfb2c 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h index 564fb5a10..f8a4e8ca8 100644 --- a/src/plugins/General/lyrics/lyricswindow.h +++ b/src/plugins/General/lyrics/lyricswindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/General/mpris/mpris.cpp b/src/plugins/General/mpris/mpris.cpp index bfea8d8d3..4cf5df042 100644 --- a/src/plugins/General/mpris/mpris.cpp +++ b/src/plugins/General/mpris/mpris.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/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp index aae3cdda6..7773d86ae 100644 --- a/src/plugins/General/mpris/mpris2/player2object.cpp +++ b/src/plugins/General/mpris/mpris2/player2object.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/General/mpris/mpris2/root2object.cpp b/src/plugins/General/mpris/mpris2/root2object.cpp index 5e80d172b..a7e9bdd50 100644 --- a/src/plugins/General/mpris/mpris2/root2object.cpp +++ b/src/plugins/General/mpris/mpris2/root2object.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 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/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h index 95b64c603..f8f2f0454 100644 --- a/src/plugins/General/mpris/mprisfactory.h +++ b/src/plugins/General/mpris/mprisfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 127d9adf6..1ad9e6a19 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.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/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index 6627ff430..d18e8cf29 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.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/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h index d93852958..5ce46ca27 100644 --- a/src/plugins/General/notifier/notifierfactory.h +++ b/src/plugins/General/notifier/notifierfactory.h @@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 1cc01f8ae..4be9f6a3d 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.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/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h index 6c685c482..26d252585 100644 --- a/src/plugins/General/notifier/popupwidget.h +++ b/src/plugins/General/notifier/popupwidget.h @@ -57,7 +57,7 @@ public: void showVolume(int); protected: - virtual void mousePressEvent (QMouseEvent *); + virtual void mousePressEvent (QMouseEvent *) override; private: void updatePosition(); diff --git a/src/plugins/General/notifier/settingsdialog.h b/src/plugins/General/notifier/settingsdialog.h index 80a7284f2..bd4012aa7 100644 --- a/src/plugins/General/notifier/settingsdialog.h +++ b/src/plugins/General/notifier/settingsdialog.h @@ -38,7 +38,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_fontButton_pressed(); diff --git a/src/plugins/General/rdetect/rdetectfactory.cpp b/src/plugins/General/rdetect/rdetectfactory.cpp index f329d8ace..7df33eca3 100644 --- a/src/plugins/General/rdetect/rdetectfactory.cpp +++ b/src/plugins/General/rdetect/rdetectfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/rdetect/rdetectfactory.h b/src/plugins/General/rdetect/rdetectfactory.h index 8bb811f90..905d88bef 100644 --- a/src/plugins/General/rdetect/rdetectfactory.h +++ b/src/plugins/General/rdetect/rdetectfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/rdetect/removablehelper.cpp b/src/plugins/General/rdetect/removablehelper.cpp index ec939d9aa..ad4f37a7a 100644 --- a/src/plugins/General/rdetect/removablehelper.cpp +++ b/src/plugins/General/rdetect/removablehelper.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/General/rdetect/removablehelper.h b/src/plugins/General/rdetect/removablehelper.h index 6ef31efb3..4b37775b9 100644 --- a/src/plugins/General/rdetect/removablehelper.h +++ b/src/plugins/General/rdetect/removablehelper.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/General/rdetect/settingsdialog.cpp b/src/plugins/General/rdetect/settingsdialog.cpp index dbe7b0f5b..d9fedd40f 100644 --- a/src/plugins/General/rdetect/settingsdialog.cpp +++ b/src/plugins/General/rdetect/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/rdetect/settingsdialog.h b/src/plugins/General/rdetect/settingsdialog.h index ff033adcc..533752f6f 100644 --- a/src/plugins/General/rdetect/settingsdialog.h +++ b/src/plugins/General/rdetect/settingsdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -36,7 +36,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index 0818ee26d..0cb237183 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.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/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h index 22f5e457b..3323cab4c 100644 --- a/src/plugins/General/rgscan/rgscandialog.h +++ b/src/plugins/General/rgscan/rgscandialog.h @@ -67,7 +67,7 @@ public: private slots: void on_calculateButton_clicked(); void onScanFinished(QString url); - void reject(); + void reject() override; void on_writeButton_clicked(); private: diff --git a/src/plugins/General/rgscan/rgscanfactory.h b/src/plugins/General/rgscan/rgscanfactory.h index e6f3aa7ed..4b5a7413e 100644 --- a/src/plugins/General/rgscan/rgscanfactory.h +++ b/src/plugins/General/rgscan/rgscanfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp index 13ff79cdf..2e716bf81 100644 --- a/src/plugins/General/rgscan/rgscanner.cpp +++ b/src/plugins/General/rgscan/rgscanner.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/General/rgscan/rgscanner.h b/src/plugins/General/rgscan/rgscanner.h index 368491ef3..6f6a353f5 100644 --- a/src/plugins/General/rgscan/rgscanner.h +++ b/src/plugins/General/rgscan/rgscanner.h @@ -57,7 +57,7 @@ signals: void finished(const QString &url); private: - void run(); + void run() override; void deinit(); InputSource *m_source; Decoder *m_decoder; diff --git a/src/plugins/General/scrobbler/defines.h b/src/plugins/General/scrobbler/defines.h index ac8877eb5..aabab79d9 100644 --- a/src/plugins/General/scrobbler/defines.h +++ b/src/plugins/General/scrobbler/defines.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/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index 6082b237a..07f33e72d 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.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/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp index 667079fdd..77a22b0cd 100644 --- a/src/plugins/General/scrobbler/scrobblercache.cpp +++ b/src/plugins/General/scrobbler/scrobblercache.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/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index 5a3c5e673..31382fb1a 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp index 9dea8c77b..060b7099d 100644 --- a/src/plugins/General/scrobbler/settingsdialog.cpp +++ b/src/plugins/General/scrobbler/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/General/scrobbler/settingsdialog.h b/src/plugins/General/scrobbler/settingsdialog.h index b82af0029..a198b5fc7 100644 --- a/src/plugins/General/scrobbler/settingsdialog.h +++ b/src/plugins/General/scrobbler/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 * @@ -37,7 +37,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_newSessionButton_lastfm_clicked(); diff --git a/src/plugins/General/statusicon/coverwidget.h b/src/plugins/General/statusicon/coverwidget.h index 7434b5ea4..4947ac71e 100644 --- a/src/plugins/General/statusicon/coverwidget.h +++ b/src/plugins/General/statusicon/coverwidget.h @@ -38,7 +38,7 @@ public: virtual void setPixmap(const QPixmap&); protected: - void paintEvent (QPaintEvent *event); + void paintEvent (QPaintEvent *event) override; private: QPixmap m_pixmap; diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp index 5667d8637..4c435c64d 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.cpp +++ b/src/plugins/General/statusicon/qmmptrayicon.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/General/statusicon/qmmptrayicon.h b/src/plugins/General/statusicon/qmmptrayicon.h index 190d52a73..7ad640fc8 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.h +++ b/src/plugins/General/statusicon/qmmptrayicon.h @@ -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 * @@ -43,7 +43,7 @@ public: #ifdef QMMP_WS_X11 private: - bool event(QEvent *e); + bool event(QEvent *e) override; void wheelEvent(QWheelEvent *e); void showToolTip(); diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index 7754abc83..f5a72c981 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/General/statusicon/settingsdialog.h b/src/plugins/General/statusicon/settingsdialog.h index 776172129..37358ef0c 100644 --- a/src/plugins/General/statusicon/settingsdialog.h +++ b/src/plugins/General/statusicon/settingsdialog.h @@ -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 * @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_templateButton_clicked(); diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 3c963a7a0..abfc89097 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.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/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h index 6225b977d..ecc8d045f 100644 --- a/src/plugins/General/statusicon/statusicon.h +++ b/src/plugins/General/statusicon/statusicon.h @@ -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/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index d33b9d6ec..c4bc45e1d 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index f79b8ed6e..cf444837a 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2009 by Artur Guzik * * a.guzik88@gmail.com * * * - * 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/General/statusicon/statusiconpopupwidget.h b/src/plugins/General/statusicon/statusiconpopupwidget.h index 906435933..4905df48b 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.h +++ b/src/plugins/General/statusicon/statusiconpopupwidget.h @@ -2,7 +2,7 @@ * Copyright (C) 2009 by Artur Guzik * * a.guzik88@gmail.com * * * - * Copyright (C) 2009-2017 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 * @@ -49,7 +49,7 @@ public: void showInfo(int x, int y, const QString &message); //x,y are tray icon position protected: - virtual void mousePressEvent(QMouseEvent *); + virtual void mousePressEvent(QMouseEvent *) override; private slots: void updatePosition(int trayx, int trayy); @@ -76,7 +76,7 @@ class TimeBar : public QProgressBar Q_OBJECT public: TimeBar(QWidget *parent = nullptr); - virtual QString text() const; + virtual QString text() const override; }; #endif diff --git a/src/plugins/General/streambrowser/editstreamdialog.cpp b/src/plugins/General/streambrowser/editstreamdialog.cpp index 132738111..2828db5e8 100644 --- a/src/plugins/General/streambrowser/editstreamdialog.cpp +++ b/src/plugins/General/streambrowser/editstreamdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/streambrowser/editstreamdialog.h b/src/plugins/General/streambrowser/editstreamdialog.h index 4f6ddc500..8e2d77bbb 100644 --- a/src/plugins/General/streambrowser/editstreamdialog.h +++ b/src/plugins/General/streambrowser/editstreamdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -46,7 +46,7 @@ public: }; public slots: - void accept(); + void accept() override; void setValues(const QMap<Key, QString> &values); const QMap<Key, QString> &values() const; diff --git a/src/plugins/General/streambrowser/streambrowser.cpp b/src/plugins/General/streambrowser/streambrowser.cpp index 44f473482..ebb4c35c5 100644 --- a/src/plugins/General/streambrowser/streambrowser.cpp +++ b/src/plugins/General/streambrowser/streambrowser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2018 by Ilya Kotov * + * Copyright (C) 2012-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/General/streambrowser/streambrowserfactory.h b/src/plugins/General/streambrowser/streambrowserfactory.h index c4436ff81..5a39115d8 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.h +++ b/src/plugins/General/streambrowser/streambrowserfactory.h @@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/streambrowser/streamwindow.h b/src/plugins/General/streambrowser/streamwindow.h index 4bdd731a9..34bc7bab3 100644 --- a/src/plugins/General/streambrowser/streamwindow.h +++ b/src/plugins/General/streambrowser/streamwindow.h @@ -59,7 +59,7 @@ private slots: void removeFromFavorites(); private: - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; void readXml(QIODevice *input, QStandardItemModel *model); void createInitialConfig(); @@ -84,7 +84,7 @@ public: StreamsProxyModel(QObject *parent) : QSortFilterProxyModel(parent){} protected: - bool lessThan (const QModelIndex &left, const QModelIndex &right) const + bool lessThan (const QModelIndex &left, const QModelIndex &right) const override { if(left.column() == 2 && right.column() == 2) { diff --git a/src/plugins/General/taskbar/taskbarfactory.cpp b/src/plugins/General/taskbar/taskbarfactory.cpp index fcdd88f34..d7046e357 100644 --- a/src/plugins/General/taskbar/taskbarfactory.cpp +++ b/src/plugins/General/taskbar/taskbarfactory.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/General/taskbar/taskbarfactory.h b/src/plugins/General/taskbar/taskbarfactory.h index bdc4e06db..8ae9151b4 100644 --- a/src/plugins/General/taskbar/taskbarfactory.h +++ b/src/plugins/General/taskbar/taskbarfactory.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,11 +35,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0")
Q_INTERFACES(GeneralFactory)
public:
- GeneralProperties properties() const;
- QObject *create(QObject *parent);
- QDialog *createConfigDialog(QWidget *parent);
- void showAbout(QWidget *parent);
- QString translation() const;
+ GeneralProperties properties() const override;
+ QObject *create(QObject *parent) override;
+ QDialog *createConfigDialog(QWidget *parent) override;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
};
#endif
diff --git a/src/plugins/General/taskbar/taskbarhelper.cpp b/src/plugins/General/taskbar/taskbarhelper.cpp index 3336fcec7..75142093b 100644 --- a/src/plugins/General/taskbar/taskbarhelper.cpp +++ b/src/plugins/General/taskbar/taskbarhelper.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/General/taskbar/taskbarhelper.h b/src/plugins/General/taskbar/taskbarhelper.h index db4082c12..6dbb3a507 100644 --- a/src/plugins/General/taskbar/taskbarhelper.h +++ b/src/plugins/General/taskbar/taskbarhelper.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2018 by Ilya Kotov *
+ * Copyright (C) 2018-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/General/trackchange/settingsdialog.cpp b/src/plugins/General/trackchange/settingsdialog.cpp index f6122d748..dc7132139 100644 --- a/src/plugins/General/trackchange/settingsdialog.cpp +++ b/src/plugins/General/trackchange/settingsdialog.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/General/trackchange/settingsdialog.h b/src/plugins/General/trackchange/settingsdialog.h index 57b9a350f..654ae509a 100644 --- a/src/plugins/General/trackchange/settingsdialog.h +++ b/src/plugins/General/trackchange/settingsdialog.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 * @@ -38,7 +38,7 @@ public: ~SettingsDialog(); public slots: - void accept(); + void accept() override; private slots: void addTemplateString(const QString &str); diff --git a/src/plugins/General/trackchange/trackchange.cpp b/src/plugins/General/trackchange/trackchange.cpp index dd1fc71db..259a4d474 100644 --- a/src/plugins/General/trackchange/trackchange.cpp +++ b/src/plugins/General/trackchange/trackchange.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/General/trackchange/trackchange.h b/src/plugins/General/trackchange/trackchange.h index 5cfba8e9d..30f0cb636 100644 --- a/src/plugins/General/trackchange/trackchange.h +++ b/src/plugins/General/trackchange/trackchange.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/General/trackchange/trackchangefactory.h b/src/plugins/General/trackchange/trackchangefactory.h index f8470b1b6..63b8a144a 100644 --- a/src/plugins/General/trackchange/trackchangefactory.h +++ b/src/plugins/General/trackchange/trackchangefactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/udisks2/settingsdialog.h b/src/plugins/General/udisks2/settingsdialog.h index c8191f380..4364df4ed 100644 --- a/src/plugins/General/udisks2/settingsdialog.h +++ b/src/plugins/General/udisks2/settingsdialog.h @@ -36,7 +36,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks2/udisks2factory.h index e760bf43c..fecfa6268 100644 --- a/src/plugins/General/udisks2/udisks2factory.h +++ b/src/plugins/General/udisks2/udisks2factory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: - GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + GeneralProperties properties() const override; + QObject *create(QObject *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp index fdae8b923..be73686b3 100644 --- a/src/plugins/General/udisks2/udisks2plugin.cpp +++ b/src/plugins/General/udisks2/udisks2plugin.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/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; diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 3499097ea..0f4dd5d37 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.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/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 0a3a68118..91ac401b6 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.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 * @@ -38,14 +38,14 @@ public: OutputALSA(); ~OutputALSA(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; //output api - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); - void suspend(); - void resume(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; + void suspend() override; + void resume() override; private: // helper functions @@ -74,10 +74,10 @@ public: VolumeALSA(); virtual ~VolumeALSA(); - void setVolume(const VolumeSettings &vol); - VolumeSettings volume() const; + void setVolume(const VolumeSettings &vol) override; + VolumeSettings volume() const override; - bool hasNotifySignal() const; + bool hasNotifySignal() const override; private: //alsa mixer diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index 5a942c06a..001a152bd 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -36,12 +36,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index c6e9a82e7..c6cf270ff 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/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/Output/alsa/settingsdialog.h b/src/plugins/Output/alsa/settingsdialog.h index 60b85d99c..02f38138e 100644 --- a/src/plugins/Output/alsa/settingsdialog.h +++ b/src/plugins/Output/alsa/settingsdialog.h @@ -40,7 +40,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void setText(int); diff --git a/src/plugins/Output/directsound/outputdirectsound.cpp b/src/plugins/Output/directsound/outputdirectsound.cpp index b9781dd11..245e235f4 100644 --- a/src/plugins/Output/directsound/outputdirectsound.cpp +++ b/src/plugins/Output/directsound/outputdirectsound.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2014-2017 by Ilya Kotov *
+ * Copyright (C) 2014-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h index 94a07d9b7..acd07fa24 100644 --- a/src/plugins/Output/directsound/outputdirectsound.h +++ b/src/plugins/Output/directsound/outputdirectsound.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2014-2017 by Ilya Kotov *
+ * Copyright (C) 2014-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp index e6a0b0884..04a50babe 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2014-2017 by Ilya Kotov *
+ * Copyright (C) 2014-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.h b/src/plugins/Output/directsound/outputdirectsoundfactory.h index 1c355d526..700aaca24 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.h +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2014-2017 by Ilya Kotov *
+ * Copyright (C) 2014-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -38,8 +38,8 @@ public: Output* create();
Volume *createVolume();
void showSettings(QWidget* parent);
- void showAbout(QWidget *parent);
- QString translation() const;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
};
#endif
diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h index c812cc6f3..b2ffaa328 100644 --- a/src/plugins/Output/jack/outputjack.h +++ b/src/plugins/Output/jack/outputjack.h @@ -38,12 +38,12 @@ public: OutputJACK(); ~OutputJACK(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; //output api - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(){} - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override {} + void reset() override; private: // helper functions diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index b004dbbc6..88220f4ce 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -37,12 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/null/outputnull.h b/src/plugins/Output/null/outputnull.h index c0d71cc1c..26b461753 100644 --- a/src/plugins/Output/null/outputnull.h +++ b/src/plugins/Output/null/outputnull.h @@ -32,12 +32,12 @@ public: OutputNull(); ~OutputNull(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; //output api - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; private: qint64 m_bytes_per_second; diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h index 543f20846..48f65e47b 100644 --- a/src/plugins/Output/null/outputnullfactory.h +++ b/src/plugins/Output/null/outputnullfactory.h @@ -37,12 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h index 0a1c31203..59e366d5f 100644 --- a/src/plugins/Output/oss/outputoss.h +++ b/src/plugins/Output/oss/outputoss.h @@ -32,12 +32,12 @@ public: OutputOSS(); virtual ~OutputOSS(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; //output api - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; private: //oss @@ -54,8 +54,8 @@ public: VolumeOSS(); ~VolumeOSS(); - void setVolume(const VolumeSettings &vol); - VolumeSettings volume() const; + void setVolume(const VolumeSettings &vol) override; + VolumeSettings volume() const override; private: //oss mixer diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index fa18c136e..a42be2033 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.h @@ -37,12 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/oss/settingsdialog.h b/src/plugins/Output/oss/settingsdialog.h index 36f088f1e..f336898fb 100644 --- a/src/plugins/Output/oss/settingsdialog.h +++ b/src/plugins/Output/oss/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - void accept(); + void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/Output/oss4/outputoss4.h b/src/plugins/Output/oss4/outputoss4.h index 5d2cffe8f..189e85613 100644 --- a/src/plugins/Output/oss4/outputoss4.h +++ b/src/plugins/Output/oss4/outputoss4.h @@ -38,14 +38,14 @@ public: OutputOSS4(); virtual ~OutputOSS4(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; int fd(); //output api - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); - qint64 latency(); + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; + qint64 latency() override; static OutputOSS4 *instance(); static VolumeOSS4 *m_vc; @@ -66,8 +66,8 @@ public: VolumeOSS4(); ~VolumeOSS4(); - void setVolume(const VolumeSettings &vol); - VolumeSettings volume() const; + void setVolume(const VolumeSettings &vol) override; + VolumeSettings volume() const override; void restore(); private: diff --git a/src/plugins/Output/oss4/outputoss4factory.h b/src/plugins/Output/oss4/outputoss4factory.h index d420f3d15..9b2f39922 100644 --- a/src/plugins/Output/oss4/outputoss4factory.h +++ b/src/plugins/Output/oss4/outputoss4factory.h @@ -36,12 +36,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/oss4/settingsdialog.h b/src/plugins/Output/oss4/settingsdialog.h index c88da080e..e4fc71e7e 100644 --- a/src/plugins/Output/oss4/settingsdialog.h +++ b/src/plugins/Output/oss4/settingsdialog.h @@ -37,7 +37,7 @@ private slots: void setText(int n); private: - virtual void accept(); + virtual void accept() override; Ui::SettingsDialog ui; QStringList m_devices; diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp index 938b49caf..478d6cdc7 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudio.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/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h index ae95da520..bd601fc05 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudio.h +++ b/src/plugins/Output/pulseaudio/outputpulseaudio.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 * @@ -40,14 +40,14 @@ public: OutputPulseAudio(); ~OutputPulseAudio(); - bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; //output api - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); - void suspend(); - void resume(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; + void suspend() override; + void resume() override; void setVolume(const VolumeSettings &v); static OutputPulseAudio *instance; @@ -82,9 +82,9 @@ public: ~VolumePulseAudio(); void updateVolume(const pa_cvolume &v); - void setVolume(const VolumeSettings &vol); - VolumeSettings volume() const; - bool hasNotifySignal() const; + void setVolume(const VolumeSettings &vol) override; + VolumeSettings volume() const override; + bool hasNotifySignal() const override; static VolumeSettings cvolumeToVolumeSettings(const pa_cvolume &v); static pa_cvolume volumeSettingsToCvolume(const VolumeSettings &v, int channels); diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index 35743a69c..9ef904f93 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.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/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h index 1a029c88e..cc39cf19c 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.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 * @@ -38,12 +38,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h index f09a4307b..9eebf3793 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h @@ -38,13 +38,13 @@ public: OutputQtMultimedia(); ~OutputQtMultimedia(); - virtual bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); - virtual qint64 latency(); - virtual qint64 writeAudio(unsigned char *data, qint64 maxSize); - virtual void drain(); - virtual void reset(); - virtual void suspend(); - virtual void resume(); + virtual bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format) override; + virtual qint64 latency() override; + virtual qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + virtual void drain() override; + virtual void reset() override; + virtual void suspend() override; + virtual void resume() override; private: QScopedPointer<QAudioOutput> m_output; diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h index 08c077c95..ba55d2b9f 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h @@ -37,12 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - virtual OutputProperties properties() const; - virtual Output* create(); - virtual Volume *createVolume(); - virtual void showSettings(QWidget* parent); - virtual void showAbout(QWidget *parent); - virtual QString translation() const; + virtual OutputProperties properties() const override; + virtual Output* create() override; + virtual Volume *createVolume() override; + virtual void showSettings(QWidget* parent) override; + virtual void showAbout(QWidget *parent) override; + virtual QString translation() const override; }; #endif diff --git a/src/plugins/Output/qtmultimedia/settingsdialog.h b/src/plugins/Output/qtmultimedia/settingsdialog.h index 19fc13386..3c5dd4923 100644 --- a/src/plugins/Output/qtmultimedia/settingsdialog.h +++ b/src/plugins/Output/qtmultimedia/settingsdialog.h @@ -34,7 +34,7 @@ public: ~SettingsDialog(); private: - virtual void accept(); + virtual void accept() override; Ui::SettingsDialog ui; }; diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h index 174d42807..966e97ffd 100644 --- a/src/plugins/Output/shout/outputshoutfactory.h +++ b/src/plugins/Output/shout/outputshoutfactory.h @@ -37,12 +37,12 @@ Q_INTERFACES(OutputFactory) public: OutputShoutFactory(); - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; private: ShoutClient *m_connection; diff --git a/src/plugins/Output/shout/settingsdialog.h b/src/plugins/Output/shout/settingsdialog.h index 4e44cfd2a..070d67e38 100644 --- a/src/plugins/Output/shout/settingsdialog.h +++ b/src/plugins/Output/shout/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/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp index 90a4b0b49..5e65f963f 100644 --- a/src/plugins/Output/shout/shoutoutput.cpp +++ b/src/plugins/Output/shout/shoutoutput.cpp @@ -205,7 +205,7 @@ void ShoutOutput::drain() void ShoutOutput::reset() {} -void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData) +void ShoutOutput::setTrackInfo(const TrackInfo &info) { vorbis_comment_clear(&m_vc); @@ -229,8 +229,8 @@ void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData) int i = 0; while(tag_map[i].key != Qmmp::UNKNOWN) { - if(!metaData[tag_map[i].key].isEmpty()) - vorbis_comment_add_tag(&m_vc, tag_map[i].tag, metaData[tag_map[i].key].toUtf8().constData()); + if(!info.value(tag_map[i].key).isEmpty()) + vorbis_comment_add_tag(&m_vc, tag_map[i].tag, info.value(tag_map[i].key).toUtf8().constData()); i++; } sendHeader(); diff --git a/src/plugins/Output/shout/shoutoutput.h b/src/plugins/Output/shout/shoutoutput.h index 5c0bc6d2c..6536f0a60 100644 --- a/src/plugins/Output/shout/shoutoutput.h +++ b/src/plugins/Output/shout/shoutoutput.h @@ -32,12 +32,12 @@ public: ShoutOutput(ShoutClient *m); ~ShoutOutput(); - bool initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat); - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); - void setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData); + bool initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat) override; + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; + void setTrackInfo(const TrackInfo &info) override; private: void sendHeader(); diff --git a/src/plugins/Output/wasapi/outputwasapi.cpp b/src/plugins/Output/wasapi/outputwasapi.cpp index c40171198..27448c881 100644 --- a/src/plugins/Output/wasapi/outputwasapi.cpp +++ b/src/plugins/Output/wasapi/outputwasapi.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2016-2017 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/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp index 24a21e79b..6d0924486 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.cpp +++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2016-2017 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/Output/wasapi/outputwasapifactory.h b/src/plugins/Output/wasapi/outputwasapifactory.h index 7c3a818f9..850968854 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.h +++ b/src/plugins/Output/wasapi/outputwasapifactory.h @@ -38,8 +38,8 @@ public: Output* create();
Volume *createVolume();
void showSettings(QWidget* parent);
- void showAbout(QWidget *parent);
- QString translation() const;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
};
#endif
diff --git a/src/plugins/Output/wasapi/settingsdialog.cpp b/src/plugins/Output/wasapi/settingsdialog.cpp index 910cd7782..db9c483b3 100644 --- a/src/plugins/Output/wasapi/settingsdialog.cpp +++ b/src/plugins/Output/wasapi/settingsdialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2017-2018 by Ilya Kotov *
+ * Copyright (C) 2017-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Output/wasapi/settingsdialog.h b/src/plugins/Output/wasapi/settingsdialog.h index 61dadeebb..719c9fdf1 100644 --- a/src/plugins/Output/wasapi/settingsdialog.h +++ b/src/plugins/Output/wasapi/settingsdialog.h @@ -31,7 +31,7 @@ public: explicit SettingsDialog(QWidget *parent = nullptr);
public slots:
- void accept();
+ void accept() override;
private:
void enumDevices();
diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp index 12175d7f7..9b9de7afa 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.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/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h index 7a8e8837e..252f446c8 100644 --- a/src/plugins/Output/waveout/outputwaveout.h +++ b/src/plugins/Output/waveout/outputwaveout.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2009-2017 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/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index 9d3a596ec..e2cf41bc9 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2009-2017 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/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index 7d4d55f6b..c8bb4c5f8 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2009-2017 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 *
@@ -39,8 +39,8 @@ public: Output* create();
Volume *createVolume();
void showSettings(QWidget* parent);
- void showAbout(QWidget *parent);
- QString translation() const;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
};
#endif
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp index dca7bac33..f004f5099 100644 --- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp +++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.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/PlayListFormats/m3u/m3uplaylistformat.h b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h index c22bab1c8..800e56795 100644 --- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h +++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h @@ -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 * @@ -36,9 +36,9 @@ class M3UPlaylistFormat : public QObject, public PlayListFormat Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: - const PlayListFormatProperties properties() const; - QList<PlayListTrack*> decode(const QByteArray &contents); - QByteArray encode(const QList<PlayListTrack*>& contents, const QString &path); + const PlayListFormatProperties properties() const override; + QList<PlayListTrack*> decode(const QByteArray &contents) override; + QByteArray encode(const QList<PlayListTrack*>& contents, const QString &path) override; }; diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp index 47ba32822..d2682bad6 100644 --- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp +++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.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/PlayListFormats/pls/plsplaylistformat.h b/src/plugins/PlayListFormats/pls/plsplaylistformat.h index 96dcf225b..b1d68486e 100644 --- a/src/plugins/PlayListFormats/pls/plsplaylistformat.h +++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.h @@ -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 * @@ -36,9 +36,9 @@ class PLSPlaylistFormat : public QObject, public PlayListFormat Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: - const PlayListFormatProperties properties() const; - QList<PlayListTrack*> decode(const QByteArray& contents); - QByteArray encode(const QList<PlayListTrack*> &contents, const QString &path); + const PlayListFormatProperties properties() const override; + QList<PlayListTrack*> decode(const QByteArray& contents) override; + QByteArray encode(const QList<PlayListTrack*> &contents, const QString &path) override; }; diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp index 7a66bc7bb..40ad3eaca 100644 --- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp +++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.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/PlayListFormats/xspf/xspfplaylistformat.h b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h index fca9fff6a..007e4df21 100644 --- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h +++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h @@ -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 * @@ -36,9 +36,9 @@ class XSPFPlaylistFormat : public QObject, public PlayListFormat Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: - const PlayListFormatProperties properties() const; - QList<PlayListTrack*> decode(const QByteArray &contents); - QByteArray encode(const QList<PlayListTrack*> &contents, const QString &path); + const PlayListFormatProperties properties() const override; + QList<PlayListTrack*> decode(const QByteArray &contents) override; + QByteArray encode(const QList<PlayListTrack*> &contents, const QString &path) override; }; #endif diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h index 5e5e37d52..862c64de1 100644 --- a/src/plugins/Transports/http/httpinputfactory.h +++ b/src/plugins/Transports/http/httpinputfactory.h @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: - InputSourceProperties properties() const; - InputSource *create(const QString &url, QObject *parent = nullptr); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + InputSourceProperties properties() const override; + InputSource *create(const QString &url, QObject *parent = nullptr) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif // HTTPINPUTFACTORY_H diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h index 809b27ac5..fad94992d 100644 --- a/src/plugins/Transports/http/httpinputsource.h +++ b/src/plugins/Transports/http/httpinputsource.h @@ -34,11 +34,11 @@ Q_OBJECT public: HTTPInputSource(const QString &path, QObject *parent = nullptr); - QIODevice *ioDevice(); - bool initialize(); - bool isReady(); - bool isWaiting(); - QString contentType() const; + QIODevice *ioDevice() override; + bool initialize() override; + bool isReady() override; + bool isWaiting() override; + QString contentType() const override; private: HttpStreamReader *m_reader; diff --git a/src/plugins/Transports/http/httpstreamreader.h b/src/plugins/Transports/http/httpstreamreader.h index ebb0a657e..e63220525 100644 --- a/src/plugins/Transports/http/httpstreamreader.h +++ b/src/plugins/Transports/http/httpstreamreader.h @@ -66,13 +66,13 @@ public: /** * QIODevice API */ - bool atEnd () const; - qint64 bytesAvailable () const; - qint64 bytesToWrite () const; - void close (); - bool isSequential () const; - bool open (OpenMode mode); - bool seek (qint64 pos); + bool atEnd () const override; + qint64 bytesAvailable () const override; + qint64 bytesToWrite () const override; + void close () override; + bool isSequential () const override; + bool open (OpenMode mode) override; + bool seek (qint64 pos) override; /** * helper functions */ @@ -88,8 +88,8 @@ signals: void error(); protected: - qint64 readData(char*, qint64); - qint64 writeData(const char*, qint64); + qint64 readData(char*, qint64) override; + qint64 writeData(const char*, qint64) override; private: void abort(); @@ -124,7 +124,7 @@ public: virtual ~DownloadThread (); private: - virtual void run(); + virtual void run() override; HttpStreamReader *m_parent; }; diff --git a/src/plugins/Transports/http/settingsdialog.h b/src/plugins/Transports/http/settingsdialog.h index d85dc2d69..576dc2b10 100644 --- a/src/plugins/Transports/http/settingsdialog.h +++ b/src/plugins/Transports/http/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); private slots: - virtual void accept(); + virtual void accept() override; private: void findCodecs(); diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index da9698eb6..afd84ee65 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 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 * @@ -34,11 +34,11 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: - InputSourceProperties properties() const; - InputSource *create(const QString &url, QObject *parent = nullptr); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + InputSourceProperties properties() const override; + InputSource *create(const QString &url, QObject *parent = nullptr) override; + void showSettings(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif // MMSINPUTFACTORY_H diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h index d125a2c45..990be1801 100644 --- a/src/plugins/Transports/mms/mmsinputsource.h +++ b/src/plugins/Transports/mms/mmsinputsource.h @@ -34,11 +34,11 @@ Q_OBJECT public: MMSInputSource(const QString &path, QObject *parent = nullptr); - QIODevice *ioDevice(); - bool initialize(); - bool isReady(); - bool isWaiting(); - QString contentType() const; + QIODevice *ioDevice() override; + bool initialize() override; + bool isReady() override; + bool isWaiting() override; + QString contentType() const override; private: MMSStreamReader *m_reader; diff --git a/src/plugins/Transports/mms/mmsstreamreader.h b/src/plugins/Transports/mms/mmsstreamreader.h index d4d6afcf1..92b141495 100644 --- a/src/plugins/Transports/mms/mmsstreamreader.h +++ b/src/plugins/Transports/mms/mmsstreamreader.h @@ -47,13 +47,13 @@ public: /** * QIODevice API */ - bool atEnd () const; - qint64 bytesAvailable () const; - qint64 bytesToWrite () const; - void close (); - bool isSequential () const; - bool open (OpenMode mode); - bool seek (qint64 pos); + bool atEnd () const override; + qint64 bytesAvailable () const override; + qint64 bytesToWrite () const override; + void close () override; + bool isSequential () const override; + bool open (OpenMode mode) override; + bool seek (qint64 pos) override; /** * helper functions */ @@ -70,8 +70,8 @@ signals: void error(); private: - virtual qint64 readData(char*, qint64); - virtual qint64 writeData(const char*, qint64); + virtual qint64 readData(char*, qint64) override; + virtual qint64 writeData(const char*, qint64) override; QMutex m_mutex; QString m_url; @@ -97,7 +97,7 @@ public: } private: - virtual void run(); + virtual void run() override; MMSStreamReader *m_parent; }; diff --git a/src/plugins/Transports/mms/settingsdialog.h b/src/plugins/Transports/mms/settingsdialog.h index 8d109b132..db4f16367 100644 --- a/src/plugins/Transports/mms/settingsdialog.h +++ b/src/plugins/Transports/mms/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); private slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog ui; diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 03d900624..5e7eb8977 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 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/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h index a33b0fed2..4bbad8615 100644 --- a/src/plugins/Ui/qsui/actionmanager.h +++ b/src/plugins/Ui/qsui/actionmanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 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/Ui/qsui/colorwidget.h b/src/plugins/Ui/qsui/colorwidget.h index 1f8049ef5..95e0b4f25 100644 --- a/src/plugins/Ui/qsui/colorwidget.h +++ b/src/plugins/Ui/qsui/colorwidget.h @@ -40,7 +40,7 @@ public slots: void setColor (QString); private: - void mousePressEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; QString m_colorName; diff --git a/src/plugins/Ui/qsui/coverwidget.cpp b/src/plugins/Ui/qsui/coverwidget.cpp index afe948207..23712a4a9 100644 --- a/src/plugins/Ui/qsui/coverwidget.cpp +++ b/src/plugins/Ui/qsui/coverwidget.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/Ui/qsui/coverwidget.h b/src/plugins/Ui/qsui/coverwidget.h index e66dfad35..95d7895c3 100644 --- a/src/plugins/Ui/qsui/coverwidget.h +++ b/src/plugins/Ui/qsui/coverwidget.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 * @@ -43,7 +43,7 @@ private slots: void saveAs(); private: - void paintEvent (QPaintEvent *); + void paintEvent (QPaintEvent *) override; QPixmap m_pixmap; }; diff --git a/src/plugins/Ui/qsui/elidinglabel.h b/src/plugins/Ui/qsui/elidinglabel.h index f348bcfc1..fc3a342a9 100644 --- a/src/plugins/Ui/qsui/elidinglabel.h +++ b/src/plugins/Ui/qsui/elidinglabel.h @@ -48,7 +48,7 @@ public: void setElideMode(const Qt::TextElideMode &elideMode); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: Qt::TextElideMode m_elideMode; diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp index fa017bb17..099b85e62 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.cpp +++ b/src/plugins/Ui/qsui/filesystembrowser.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 * @@ -41,7 +41,7 @@ public: protected: virtual bool filterAcceptsRow( - int source_row, const QModelIndex &source_parent) const{ + int source_row, const QModelIndex &source_parent) const override { QFileSystemModel *sm = qobject_cast<QFileSystemModel*>(sourceModel()); if (source_parent == sm->index(sm->rootPath())) { return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); diff --git a/src/plugins/Ui/qsui/filesystembrowser.h b/src/plugins/Ui/qsui/filesystembrowser.h index 1a01cfcad..82e7684f7 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.h +++ b/src/plugins/Ui/qsui/filesystembrowser.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 * diff --git a/src/plugins/Ui/qsui/keyboardmanager.cpp b/src/plugins/Ui/qsui/keyboardmanager.cpp index b1c447258..cdf581f25 100644 --- a/src/plugins/Ui/qsui/keyboardmanager.cpp +++ b/src/plugins/Ui/qsui/keyboardmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp index 0841b5062..2ace2d171 100644 --- a/src/plugins/Ui/qsui/listwidget.cpp +++ b/src/plugins/Ui/qsui/listwidget.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/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h index 1ac01cddf..a5155f883 100644 --- a/src/plugins/Ui/qsui/listwidget.h +++ b/src/plugins/Ui/qsui/listwidget.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 * @@ -79,21 +79,21 @@ signals: void positionChanged(int, int); //current position, maximum value protected: - void paintEvent(QPaintEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void resizeEvent(QResizeEvent *); - void wheelEvent(QWheelEvent *); - void showEvent(QShowEvent *); + void paintEvent(QPaintEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + void wheelEvent(QWheelEvent *) override; + void showEvent(QShowEvent *) override; int indexAt(int)const; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *); - void dragMoveEvent(QDragMoveEvent *event); - void contextMenuEvent (QContextMenuEvent * event); - bool event (QEvent *e); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void contextMenuEvent (QContextMenuEvent * event) override; + bool event (QEvent *e) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp index 000965152..81f68d568 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp +++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.h b/src/plugins/Ui/qsui/listwidgetdrawer.h index bb91b88b2..77412db45 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.h +++ b/src/plugins/Ui/qsui/listwidgetdrawer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp index c413dfbb3..27e0a6290 100644 --- a/src/plugins/Ui/qsui/logo.cpp +++ b/src/plugins/Ui/qsui/logo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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/Ui/qsui/logo.h b/src/plugins/Ui/qsui/logo.h index d8a478125..aff70a77a 100644 --- a/src/plugins/Ui/qsui/logo.h +++ b/src/plugins/Ui/qsui/logo.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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 * @@ -42,15 +42,15 @@ public: virtual ~Logo(); public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void updateLetters(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; void processPreset1(); void processPreset2(); void processPreset3(); diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index fe1932269..4f4cf750f 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.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/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h index 90d9a9174..4193a5652 100644 --- a/src/plugins/Ui/qsui/mainwindow.h +++ b/src/plugins/Ui/qsui/mainwindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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 * @@ -94,8 +94,8 @@ private slots: void restoreWindowTitle(); private: - void closeEvent(QCloseEvent *); - void hideEvent(QHideEvent *); + void closeEvent(QCloseEvent *) override; + void hideEvent(QHideEvent *) override; void createWidgets(); void createActions(); void writeSettings(); diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h index 5f5d38df9..98d613a13 100644 --- a/src/plugins/Ui/qsui/playlistbrowser.h +++ b/src/plugins/Ui/qsui/playlistbrowser.h @@ -48,7 +48,7 @@ private slots: void updateCurrentRow(QModelIndex index, QModelIndex); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; QLineEdit *m_lineEdit; QListView *m_listView; PlayListManager *m_pl_manager; diff --git a/src/plugins/Ui/qsui/playlistheader.h b/src/plugins/Ui/qsui/playlistheader.h index fa5cafb71..7b8d68a95 100644 --- a/src/plugins/Ui/qsui/playlistheader.h +++ b/src/plugins/Ui/qsui/playlistheader.h @@ -71,12 +71,12 @@ private slots: void onColumnRemoved(); private: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *e); - void contextMenuEvent(QContextMenuEvent *e); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void paintEvent(QPaintEvent *) override; int findColumn(QPoint pos); void initStyleOption(QStyleOptionHeader *opt); int size(int index) const; @@ -85,8 +85,8 @@ private: void adjustColumn(int index); int autoResizeColumn() const; void writeSettings(); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; enum DataKey { diff --git a/src/plugins/Ui/qsui/popupsettings.cpp b/src/plugins/Ui/qsui/popupsettings.cpp index 0775db71e..acbaf9f1a 100644 --- a/src/plugins/Ui/qsui/popupsettings.cpp +++ b/src/plugins/Ui/qsui/popupsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h index 3be5c6daa..f4016ad3c 100644 --- a/src/plugins/Ui/qsui/popupsettings.h +++ b/src/plugins/Ui/qsui/popupsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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 * @@ -35,7 +35,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_resetButton_clicked(); diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp index ae145a2cc..86ebae570 100644 --- a/src/plugins/Ui/qsui/popupwidget.cpp +++ b/src/plugins/Ui/qsui/popupwidget.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/Ui/qsui/popupwidget.h b/src/plugins/Ui/qsui/popupwidget.h index 00f3751f1..656da06fa 100644 --- a/src/plugins/Ui/qsui/popupwidget.h +++ b/src/plugins/Ui/qsui/popupwidget.h @@ -46,8 +46,8 @@ public: const QString url() const; protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void mouseMoveEvent (QMouseEvent *); + virtual void mousePressEvent (QMouseEvent *) override; + virtual void mouseMoveEvent (QMouseEvent *) override; private slots: void loadCover(); diff --git a/src/plugins/Ui/qsui/positionslider.h b/src/plugins/Ui/qsui/positionslider.h index ebb3db302..0b5ed59ef 100644 --- a/src/plugins/Ui/qsui/positionslider.h +++ b/src/plugins/Ui/qsui/positionslider.h @@ -37,9 +37,9 @@ public: virtual ~PositionSlider(){} protected: - virtual void mousePressEvent (QMouseEvent *event); - virtual void mouseReleaseEvent (QMouseEvent *event); - virtual void wheelEvent(QWheelEvent *event); + virtual void mousePressEvent (QMouseEvent *event) override; + virtual void mouseReleaseEvent (QMouseEvent *event) override; + virtual void wheelEvent(QWheelEvent *event) override; private slots: void onSliderMoved(int pos); diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp index e510c6bc7..e86174d16 100644 --- a/src/plugins/Ui/qsui/qsuianalyzer.cpp +++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2017 by Ilya Kotov * + * Copyright (C) 2012-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/qsuianalyzer.h b/src/plugins/Ui/qsui/qsuianalyzer.h index b75e9569a..52c50c9f9 100644 --- a/src/plugins/Ui/qsui/qsuianalyzer.h +++ b/src/plugins/Ui/qsui/qsuianalyzer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2017 by Ilya Kotov * + * Copyright (C) 2012-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -40,11 +40,11 @@ public: void setCover(const QPixmap &pixmap); void clear(); void clearCover(); - QSize sizeHint() const; + QSize sizeHint() const override; public slots: - void start(); - void stop(); + void start() override; + void stop() override; void readSettings(); private slots: @@ -52,11 +52,11 @@ private slots: void writeSettings(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void hideEvent(QHideEvent *); - void showEvent(QShowEvent *); - void resizeEvent(QResizeEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void hideEvent(QHideEvent *) override; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; void process(); void draw(QPainter *p); void createMenu(); diff --git a/src/plugins/Ui/qsui/qsuifactory.h b/src/plugins/Ui/qsui/qsuifactory.h index 259dfa6b7..b74374750 100644 --- a/src/plugins/Ui/qsui/qsuifactory.h +++ b/src/plugins/Ui/qsui/qsuifactory.h @@ -32,10 +32,10 @@ class QSUIFactory : public QObject, public UiFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: - UiProperties properties() const; - QObject *create(); - void showAbout(QWidget *parent); - QString translation() const; + UiProperties properties() const override; + QObject *create() override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp index 1b0523f58..6a64fb328 100644 --- a/src/plugins/Ui/qsui/qsuisettings.cpp +++ b/src/plugins/Ui/qsui/qsuisettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h index 26a7935e4..905959786 100644 --- a/src/plugins/Ui/qsui/qsuisettings.h +++ b/src/plugins/Ui/qsui/qsuisettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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 * @@ -47,7 +47,7 @@ private slots: void addWindowTitleString(const QString &str); private: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; void loadFonts(); void createActions(); void readSettings(); diff --git a/src/plugins/Ui/qsui/qsuitabbar.h b/src/plugins/Ui/qsui/qsuitabbar.h index 955e73c81..f04c8e26a 100644 --- a/src/plugins/Ui/qsui/qsuitabbar.h +++ b/src/plugins/Ui/qsui/qsuitabbar.h @@ -33,7 +33,7 @@ public: explicit QSUiTabBar(QWidget *parent = nullptr); private: - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(QMouseEvent *e) override; }; diff --git a/src/plugins/Ui/qsui/qsuitabwidget.h b/src/plugins/Ui/qsui/qsuitabwidget.h index 85988e7a4..53b84fc00 100644 --- a/src/plugins/Ui/qsui/qsuitabwidget.h +++ b/src/plugins/Ui/qsui/qsuitabwidget.h @@ -71,14 +71,14 @@ private slots: private: void initStyleOption(QStyleOptionTabWidgetFrame *option) const; void setUpLayout(); - void showEvent(QShowEvent *); - void resizeEvent(QResizeEvent *e); - void paintEvent(QPaintEvent *); + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *) override; void setTabBar(QTabBar *); - void changeEvent(QEvent *ev); - bool event(QEvent *ev); - void mousePressEvent(QMouseEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); + void changeEvent(QEvent *ev) override; + bool event(QEvent *ev) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; void tabInserted(int index); void tabRemoved(int index); diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h index 5d9a13469..f270b93d6 100644 --- a/src/plugins/Ui/qsui/shortcutdialog.h +++ b/src/plugins/Ui/qsui/shortcutdialog.h @@ -39,7 +39,7 @@ public: const QString key(); protected: - virtual void keyPressEvent (QKeyEvent *event); + virtual void keyPressEvent (QKeyEvent *event) override; private: Ui::ShortcutDialog m_ui; diff --git a/src/plugins/Ui/qsui/toolbareditor.h b/src/plugins/Ui/qsui/toolbareditor.h index 25eff0da4..db79f487e 100644 --- a/src/plugins/Ui/qsui/toolbareditor.h +++ b/src/plugins/Ui/qsui/toolbareditor.h @@ -44,7 +44,7 @@ public: ~ToolBarEditor(); public slots: - void accept(); + void accept() override; private slots: void on_addToolButton_clicked(); diff --git a/src/plugins/Ui/qsui/volumeslider.h b/src/plugins/Ui/qsui/volumeslider.h index 344c08000..15de1c4a7 100644 --- a/src/plugins/Ui/qsui/volumeslider.h +++ b/src/plugins/Ui/qsui/volumeslider.h @@ -37,9 +37,9 @@ public: virtual ~VolumeSlider(){} protected: - virtual void mousePressEvent (QMouseEvent *event); - virtual void mouseReleaseEvent (QMouseEvent *event); - virtual void wheelEvent(QWheelEvent *event); + virtual void mousePressEvent (QMouseEvent *event) override; + virtual void mouseReleaseEvent (QMouseEvent *event) override; + virtual void wheelEvent(QWheelEvent *event) override; private slots: void onSliderMoved(int pos); diff --git a/src/plugins/Ui/skinned/balancebar.h b/src/plugins/Ui/skinned/balancebar.h index 23628163f..8ee130ebd 100644 --- a/src/plugins/Ui/skinned/balancebar.h +++ b/src/plugins/Ui/skinned/balancebar.h @@ -59,9 +59,9 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/button.h b/src/plugins/Ui/skinned/button.h index d72bfb020..5d687c2fb 100644 --- a/src/plugins/Ui/skinned/button.h +++ b/src/plugins/Ui/skinned/button.h @@ -49,9 +49,9 @@ private: uint name_cursor; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp index ef12f595e..2ae37d308 100644 --- a/src/plugins/Ui/skinned/display.cpp +++ b/src/plugins/Ui/skinned/display.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/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h index 796630bb8..25c7bdc83 100644 --- a/src/plugins/Ui/skinned/display.h +++ b/src/plugins/Ui/skinned/display.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 * @@ -74,8 +74,8 @@ signals: void shuffleToggled(bool); protected: - void wheelEvent(QWheelEvent *); - void mousePressEvent(QMouseEvent*); + void wheelEvent(QWheelEvent *) override; + void mousePressEvent(QMouseEvent*) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index 0cd867493..7f8c291f1 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.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/Ui/skinned/eqslider.cpp b/src/plugins/Ui/skinned/eqslider.cpp index 41c824517..ed2b0d0db 100644 --- a/src/plugins/Ui/skinned/eqslider.cpp +++ b/src/plugins/Ui/skinned/eqslider.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/Ui/skinned/eqslider.h b/src/plugins/Ui/skinned/eqslider.h index eb1d53116..0ca38c380 100644 --- a/src/plugins/Ui/skinned/eqslider.h +++ b/src/plugins/Ui/skinned/eqslider.h @@ -59,10 +59,10 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void wheelEvent(QWheelEvent *); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void wheelEvent(QWheelEvent *) override; }; diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h index 1db1af2ab..6e56ab72e 100644 --- a/src/plugins/Ui/skinned/eqtitlebar.h +++ b/src/plugins/Ui/skinned/eqtitlebar.h @@ -61,10 +61,10 @@ private: ShadedBar* m_balanceBar; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent (QMouseEvent *); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent (QMouseEvent *) override; }; #endif diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp index f9cabdfc1..6785960fb 100644 --- a/src/plugins/Ui/skinned/eqwidget.cpp +++ b/src/plugins/Ui/skinned/eqwidget.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/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h index b05c608b4..0fe79b895 100644 --- a/src/plugins/Ui/skinned/eqwidget.h +++ b/src/plugins/Ui/skinned/eqwidget.h @@ -77,11 +77,11 @@ private: void updateMask(); EQPreset *findPreset(const QString &name); //events - void keyPressEvent (QKeyEvent *); - void changeEvent(QEvent*); - void closeEvent(QCloseEvent*); + void keyPressEvent (QKeyEvent *) override; + void changeEvent(QEvent*) override; + void closeEvent(QCloseEvent*) override; #ifdef QMMP_WS_X11 - bool event (QEvent *event); + bool event (QEvent *event) override; #endif Skin *m_skin; diff --git a/src/plugins/Ui/skinned/horizontalslider.h b/src/plugins/Ui/skinned/horizontalslider.h index 19ddfae8d..3933d4a31 100644 --- a/src/plugins/Ui/skinned/horizontalslider.h +++ b/src/plugins/Ui/skinned/horizontalslider.h @@ -46,9 +46,9 @@ private slots: void updateSkin(); private: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void paintEvent(QPaintEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; int convert(int) const; // value = convert(position); int sliderSize() const; diff --git a/src/plugins/Ui/skinned/hotkeyeditor.cpp b/src/plugins/Ui/skinned/hotkeyeditor.cpp index 403866ae0..638e667bb 100644 --- a/src/plugins/Ui/skinned/hotkeyeditor.cpp +++ b/src/plugins/Ui/skinned/hotkeyeditor.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/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index dc2c2d41d..67f1111dd 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.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/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h index 9f4b95bc7..36026e9f9 100644 --- a/src/plugins/Ui/skinned/listwidget.h +++ b/src/plugins/Ui/skinned/listwidget.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 * @@ -77,20 +77,20 @@ signals: void positionChanged(int, int); //current position, maximum value protected: - void paintEvent(QPaintEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void resizeEvent(QResizeEvent *); - void wheelEvent(QWheelEvent *); + void paintEvent(QPaintEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + void wheelEvent(QWheelEvent *) override; int indexAt(int)const; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *); - void dragMoveEvent(QDragMoveEvent *event); - void contextMenuEvent (QContextMenuEvent * event); - bool event (QEvent *e); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void contextMenuEvent (QContextMenuEvent * event) override; + bool event (QEvent *e) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp index 7293dc8a0..2f34cfee8 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp +++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h index 4ae907d74..dca6b4502 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.h +++ b/src/plugins/Ui/skinned/listwidgetdrawer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp index 05b2855c9..6f24a432f 100644 --- a/src/plugins/Ui/skinned/mainvisual.cpp +++ b/src/plugins/Ui/skinned/mainvisual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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/Ui/skinned/mainvisual.h b/src/plugins/Ui/skinned/mainvisual.h index e5b5e300e..0924dc310 100644 --- a/src/plugins/Ui/skinned/mainvisual.h +++ b/src/plugins/Ui/skinned/mainvisual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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 * @@ -51,16 +51,16 @@ public: static MainVisual *instance(); void setVisual(VisualBase *newvis); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; protected: - virtual void hideEvent (QHideEvent *); - virtual void showEvent (QShowEvent *); - virtual void mousePressEvent (QMouseEvent *); + virtual void hideEvent (QHideEvent *) override; + virtual void showEvent (QShowEvent *) override; + virtual void mousePressEvent (QMouseEvent *) override; public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void timeout(); @@ -103,10 +103,10 @@ public: Analyzer(); virtual ~Analyzer(); - void clear(); - bool process(float *l); - void draw(QPainter *p); - const QString name() + void clear() override; + bool process(float *l) override; + void draw(QPainter *p) override; + const QString name() override { return "Analyzer"; } @@ -128,10 +128,10 @@ class Scope : public VisualBase public: Scope(); virtual ~Scope(); - void clear(); - bool process(float *l); - void draw(QPainter *p); - const QString name() + void clear() override; + bool process(float *l) override; + void draw(QPainter *p) override; + const QString name() override { return "Scope"; } diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 2074bdc9b..ae4092390 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.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/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h index cf4f1bb9b..176009958 100644 --- a/src/plugins/Ui/skinned/mainwindow.h +++ b/src/plugins/Ui/skinned/mainwindow.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 * @@ -91,10 +91,10 @@ private slots: private: //events - void closeEvent (QCloseEvent *); - void hideEvent (QHideEvent *); - void changeEvent (QEvent *event); - void keyPressEvent (QKeyEvent* ); + void closeEvent (QCloseEvent *) override; + void hideEvent (QHideEvent *) override; + void changeEvent (QEvent *event) override; + void keyPressEvent (QKeyEvent* ) override; void readSettings(); diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h index 9b37feec7..246ec9105 100644 --- a/src/plugins/Ui/skinned/pixmapwidget.h +++ b/src/plugins/Ui/skinned/pixmapwidget.h @@ -38,8 +38,8 @@ public: virtual void setPixmap(const QPixmap &pixmap, bool fixed_size = false); protected: - void paintEvent ( QPaintEvent * event ); - virtual void mousePressEvent(QMouseEvent*); + void paintEvent ( QPaintEvent * event ) override; + virtual void mousePressEvent(QMouseEvent*) override; signals: void mouseClicked(); diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 8f280907e..9bcbc7746 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.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/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h index 67570da88..9835a8e3a 100644 --- a/src/plugins/Ui/skinned/playlist.h +++ b/src/plugins/Ui/skinned/playlist.h @@ -94,16 +94,16 @@ class PlayList : public QWidget void createMenus(); void createActions(); //events - void paintEvent (QPaintEvent *); - void resizeEvent (QResizeEvent *); - void mouseMoveEvent (QMouseEvent *); - void mousePressEvent (QMouseEvent *); - void mouseReleaseEvent (QMouseEvent *); - void changeEvent (QEvent*); - void closeEvent (QCloseEvent*); - void keyPressEvent (QKeyEvent*); + void paintEvent (QPaintEvent *) override; + void resizeEvent (QResizeEvent *) override; + void mouseMoveEvent (QMouseEvent *) override; + void mousePressEvent (QMouseEvent *) override; + void mouseReleaseEvent (QMouseEvent *) override; + void changeEvent (QEvent*) override; + void closeEvent (QCloseEvent*) override; + void keyPressEvent (QKeyEvent*) override; #ifdef QMMP_WS_X11 - bool event (QEvent *event); + bool event (QEvent *event) override; #endif QMenu *m_addMenu; QMenu *m_subMenu; diff --git a/src/plugins/Ui/skinned/playlistbrowser.h b/src/plugins/Ui/skinned/playlistbrowser.h index 5cfe21508..d0a3b2ff0 100644 --- a/src/plugins/Ui/skinned/playlistbrowser.h +++ b/src/plugins/Ui/skinned/playlistbrowser.h @@ -51,7 +51,7 @@ private slots: void on_upButton_clicked(); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; Ui::PlayListBrowser m_ui; PlayListManager *m_pl_manager; QStandardItemModel* m_listModel; diff --git a/src/plugins/Ui/skinned/playlistcontrol.h b/src/plugins/Ui/skinned/playlistcontrol.h index d661f09a8..4af6bdd90 100644 --- a/src/plugins/Ui/skinned/playlistcontrol.h +++ b/src/plugins/Ui/skinned/playlistcontrol.h @@ -49,7 +49,7 @@ private slots: void updateSkin(); private: - void mouseReleaseEvent(QMouseEvent*); + void mouseReleaseEvent(QMouseEvent*) override; int m_ratio; Skin* m_skin; }; diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h index f5622b955..ce0d8564c 100644 --- a/src/plugins/Ui/skinned/playlistheader.h +++ b/src/plugins/Ui/skinned/playlistheader.h @@ -72,12 +72,12 @@ private slots: void onColumnRemoved(); private: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *e); - void contextMenuEvent(QContextMenuEvent *e); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void paintEvent(QPaintEvent *) override; void loadColors(); void adjustColumn(int index); int autoResizeColumn() const; diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp index 37ac13eb5..5c526e8bc 100644 --- a/src/plugins/Ui/skinned/playlistselector.cpp +++ b/src/plugins/Ui/skinned/playlistselector.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/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h index 63d000e8f..7b140759a 100644 --- a/src/plugins/Ui/skinned/playlistselector.h +++ b/src/plugins/Ui/skinned/playlistselector.h @@ -49,12 +49,12 @@ private slots: void updateSkin(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent (QMouseEvent *e); - void mouseReleaseEvent (QMouseEvent *e); - void mouseDoubleClickEvent (QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent (QResizeEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent (QMouseEvent *e) override; + void mouseReleaseEvent (QMouseEvent *e) override; + void mouseDoubleClickEvent (QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent (QResizeEvent *) override; void updateOffsets(); void loadColors(); void drawButtons(); diff --git a/src/plugins/Ui/skinned/playlistslider.h b/src/plugins/Ui/skinned/playlistslider.h index 8e3b267ca..83aaad957 100644 --- a/src/plugins/Ui/skinned/playlistslider.h +++ b/src/plugins/Ui/skinned/playlistslider.h @@ -52,10 +52,10 @@ private: int convert(int); // value = convert(position); protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void paintEvent(QPaintEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp index 3450a5bc5..282454e30 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.cpp +++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h index 6e2a48cf5..b470dd808 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.h +++ b/src/plugins/Ui/skinned/playlisttitlebar.h @@ -72,11 +72,11 @@ private: MetaDataFormatter m_formatter; protected: - void resizeEvent(QResizeEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent(QMouseEvent*); + void resizeEvent(QResizeEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/popupsettings.cpp b/src/plugins/Ui/skinned/popupsettings.cpp index e57e3624a..c7bafc73d 100644 --- a/src/plugins/Ui/skinned/popupsettings.cpp +++ b/src/plugins/Ui/skinned/popupsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h index b79f1609b..e3e543194 100644 --- a/src/plugins/Ui/skinned/popupsettings.h +++ b/src/plugins/Ui/skinned/popupsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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 * @@ -34,7 +34,7 @@ public: ~PopupSettings(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_resetButton_clicked(); diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp index 5bb25afc4..154410129 100644 --- a/src/plugins/Ui/skinned/popupwidget.cpp +++ b/src/plugins/Ui/skinned/popupwidget.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/Ui/skinned/popupwidget.h b/src/plugins/Ui/skinned/popupwidget.h index 84d00d4f4..27e6eef19 100644 --- a/src/plugins/Ui/skinned/popupwidget.h +++ b/src/plugins/Ui/skinned/popupwidget.h @@ -46,8 +46,8 @@ public: const QString url() const; protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void mouseMoveEvent (QMouseEvent *); + virtual void mousePressEvent (QMouseEvent *) override; + virtual void mouseMoveEvent (QMouseEvent *) override; private slots: void loadCover(); diff --git a/src/plugins/Ui/skinned/positionbar.cpp b/src/plugins/Ui/skinned/positionbar.cpp index f5527d402..280bfbfc1 100644 --- a/src/plugins/Ui/skinned/positionbar.cpp +++ b/src/plugins/Ui/skinned/positionbar.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/Ui/skinned/positionbar.h b/src/plugins/Ui/skinned/positionbar.h index 2b0261fb9..9456aaea6 100644 --- a/src/plugins/Ui/skinned/positionbar.h +++ b/src/plugins/Ui/skinned/positionbar.h @@ -51,10 +51,10 @@ private slots: void updateSkin(); private: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void wheelEvent(QWheelEvent *e); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void wheelEvent(QWheelEvent *e) override; Skin *m_skin; bool m_moving; qint64 press_pos; diff --git a/src/plugins/Ui/skinned/shadedbar.h b/src/plugins/Ui/skinned/shadedbar.h index 1a5f96fd3..e4ebb6b7f 100644 --- a/src/plugins/Ui/skinned/shadedbar.h +++ b/src/plugins/Ui/skinned/shadedbar.h @@ -67,10 +67,10 @@ private: int m_ratio; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void paintEvent(QPaintEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void paintEvent(QPaintEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/shadedvisual.cpp b/src/plugins/Ui/skinned/shadedvisual.cpp index 82be005ea..4fc1acc82 100644 --- a/src/plugins/Ui/skinned/shadedvisual.cpp +++ b/src/plugins/Ui/skinned/shadedvisual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h index a74c6f693..a6fba4fb9 100644 --- a/src/plugins/Ui/skinned/shadedvisual.h +++ b/src/plugins/Ui/skinned/shadedvisual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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 * @@ -41,17 +41,17 @@ public: public slots: void timeout(); - void start(); - void stop(); + void start() override; + void stop() override; private slots: void updateSkin(); private: void clear(); - void paintEvent (QPaintEvent *); - void hideEvent (QHideEvent *); - void showEvent (QShowEvent *); + void paintEvent (QPaintEvent *) override; + void hideEvent (QHideEvent *) override; + void showEvent (QShowEvent *) override; void process (); void draw (QPainter *); diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h index 5d9a13469..f270b93d6 100644 --- a/src/plugins/Ui/skinned/shortcutdialog.h +++ b/src/plugins/Ui/skinned/shortcutdialog.h @@ -39,7 +39,7 @@ public: const QString key(); protected: - virtual void keyPressEvent (QKeyEvent *event); + virtual void keyPressEvent (QKeyEvent *event) override; private: Ui::ShortcutDialog m_ui; diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index cc619a7bc..f379955fb 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * Based on Promoe, an XMMS2 Client * diff --git a/src/plugins/Ui/skinned/skinnedfactory.cpp b/src/plugins/Ui/skinned/skinnedfactory.cpp index e56500772..db71da43e 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.cpp +++ b/src/plugins/Ui/skinned/skinnedfactory.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/Ui/skinned/skinnedfactory.h b/src/plugins/Ui/skinned/skinnedfactory.h index 8133314e0..c72872a5c 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.h +++ b/src/plugins/Ui/skinned/skinnedfactory.h @@ -32,10 +32,10 @@ class SkinnedFactory : public QObject, public UiFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: - UiProperties properties() const; - QObject *create(); - void showAbout(QWidget *parent); - QString translation() const; + UiProperties properties() const override; + QObject *create() override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 953205680..6bc10c20e 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h index 4f2c0c757..aa06d1e2f 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.h +++ b/src/plugins/Ui/skinned/skinnedsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 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 * @@ -50,7 +50,7 @@ private slots: private: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; void loadFonts(); void findSkins(const QString &path); void createActions(); diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp index 9167cc0fa..fe911ecd4 100644 --- a/src/plugins/Ui/skinned/textscroller.cpp +++ b/src/plugins/Ui/skinned/textscroller.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/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h index 2785b18ba..9389c0e8b 100644 --- a/src/plugins/Ui/skinned/textscroller.h +++ b/src/plugins/Ui/skinned/textscroller.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 * @@ -55,13 +55,13 @@ private slots: void clearText(); private: - void hideEvent(QHideEvent *); - void showEvent(QShowEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseDoubleClickEvent(QMouseEvent *); + void hideEvent(QHideEvent *) override; + void showEvent(QShowEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; void preparePixmap(const QString &text, bool scrollable = false); QString m_defautText; QString m_bufferText; diff --git a/src/plugins/Ui/skinned/timeindicator.h b/src/plugins/Ui/skinned/timeindicator.h index 82ca728fd..83918e9cb 100644 --- a/src/plugins/Ui/skinned/timeindicator.h +++ b/src/plugins/Ui/skinned/timeindicator.h @@ -81,9 +81,9 @@ public: ~TimeIndicator(); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); + virtual void mousePressEvent(QMouseEvent*) override; + virtual void mouseMoveEvent(QMouseEvent*) override; + virtual void mouseReleaseEvent(QMouseEvent*) override; private slots: void modelChanged(); diff --git a/src/plugins/Ui/skinned/titlebar.h b/src/plugins/Ui/skinned/titlebar.h index 284ee12d1..8d768a376 100644 --- a/src/plugins/Ui/skinned/titlebar.h +++ b/src/plugins/Ui/skinned/titlebar.h @@ -73,10 +73,10 @@ private: void updatePositions(); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent(QMouseEvent*) override; }; diff --git a/src/plugins/Ui/skinned/titlebarcontrol.h b/src/plugins/Ui/skinned/titlebarcontrol.h index 46c3a7975..2905009d0 100644 --- a/src/plugins/Ui/skinned/titlebarcontrol.h +++ b/src/plugins/Ui/skinned/titlebarcontrol.h @@ -43,9 +43,9 @@ signals: void ejectClicked(); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/togglebutton.h b/src/plugins/Ui/skinned/togglebutton.h index ab4d2e1ee..b46fd4fbc 100644 --- a/src/plugins/Ui/skinned/togglebutton.h +++ b/src/plugins/Ui/skinned/togglebutton.h @@ -53,9 +53,9 @@ private: bool m_on; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; diff --git a/src/plugins/Ui/skinned/volumebar.h b/src/plugins/Ui/skinned/volumebar.h index 7e8d83ecd..7a5db65cb 100644 --- a/src/plugins/Ui/skinned/volumebar.h +++ b/src/plugins/Ui/skinned/volumebar.h @@ -68,9 +68,9 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index e8ccf7ccb..2b10f84fe 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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/Visual/analyzer/analyzer.h b/src/plugins/Visual/analyzer/analyzer.h index df090de8b..0321eba9d 100644 --- a/src/plugins/Visual/analyzer/analyzer.h +++ b/src/plugins/Visual/analyzer/analyzer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 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 * @@ -41,8 +41,8 @@ public: virtual ~Analyzer(); public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void timeout(); @@ -52,11 +52,11 @@ private slots: private: void clear(); - virtual void hideEvent (QHideEvent *); - virtual void showEvent (QShowEvent *); - virtual void closeEvent (QCloseEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *e); + virtual void hideEvent (QHideEvent *) override; + virtual void showEvent (QShowEvent *) override; + virtual void closeEvent (QCloseEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *e) override; void process(); void draw(QPainter *p); void createMenu(); diff --git a/src/plugins/Visual/analyzer/colorwidget.h b/src/plugins/Visual/analyzer/colorwidget.h index 1f8049ef5..95e0b4f25 100644 --- a/src/plugins/Visual/analyzer/colorwidget.h +++ b/src/plugins/Visual/analyzer/colorwidget.h @@ -40,7 +40,7 @@ public slots: void setColor (QString); private: - void mousePressEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; QString m_colorName; diff --git a/src/plugins/Visual/analyzer/settingsdialog.h b/src/plugins/Visual/analyzer/settingsdialog.h index dd2df6cd7..a171cea75 100644 --- a/src/plugins/Visual/analyzer/settingsdialog.h +++ b/src/plugins/Visual/analyzer/settingsdialog.h @@ -35,7 +35,7 @@ public: ~SettingsDialog(); public slots: - virtual void accept(); + virtual void accept() override; private: Ui::SettingsDialog m_ui; diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.h b/src/plugins/Visual/analyzer/visualanalyzerfactory.h index 8457e29a7..0b6dafda3 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.h +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.h @@ -36,11 +36,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.VisualFactoryInterface.1.0") Q_INTERFACES(VisualFactory) public: - VisualProperties properties() const; - Visual *create(QWidget *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + VisualProperties properties() const override; + Visual *create(QWidget *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; diff --git a/src/plugins/Visual/projectm/projectmplugin.cpp b/src/plugins/Visual/projectm/projectmplugin.cpp index dd44872e6..442230928 100644 --- a/src/plugins/Visual/projectm/projectmplugin.cpp +++ b/src/plugins/Visual/projectm/projectmplugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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/Visual/projectm/projectmplugin.h b/src/plugins/Visual/projectm/projectmplugin.h index 84800f7ca..dfc2ab82a 100644 --- a/src/plugins/Visual/projectm/projectmplugin.h +++ b/src/plugins/Visual/projectm/projectmplugin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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,17 +37,17 @@ public: virtual ~ProjectMPlugin(); public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void onTimeout(); void setFullScreen(bool yes); private: - void closeEvent(QCloseEvent *event); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void closeEvent(QCloseEvent *event) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; QTimer *m_timer; ProjectMWidget *m_projectMWidget; QSplitter *m_splitter; diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp index 2f5a87dd6..1bc4d75c2 100644 --- a/src/plugins/Visual/projectm/projectmwidget.cpp +++ b/src/plugins/Visual/projectm/projectmwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * Copyright (C) 2007 by projectM team * diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h index 596180e84..167b3513c 100644 --- a/src/plugins/Visual/projectm/projectmwidget.h +++ b/src/plugins/Visual/projectm/projectmwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 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 * @@ -46,10 +46,10 @@ signals: void fullscreenToggled(bool); protected: - virtual void initializeGL(); - virtual void resizeGL(int width, int height); - virtual void paintGL(); - virtual void mousePressEvent (QMouseEvent *event); + virtual void initializeGL() override; + virtual void resizeGL(int width, int height) override; + virtual void paintGL() override; + virtual void mousePressEvent (QMouseEvent *event) override; private slots: void showHelp(); diff --git a/src/plugins/Visual/projectm/projectmwrapper.h b/src/plugins/Visual/projectm/projectmwrapper.h index 95f76f5ea..1fe947499 100644 --- a/src/plugins/Visual/projectm/projectmwrapper.h +++ b/src/plugins/Visual/projectm/projectmwrapper.h @@ -40,7 +40,7 @@ public slots: void selectPreset(int index); private: - void presetSwitchedEvent(bool isHardCut, unsigned int index) const; + void presetSwitchedEvent(bool isHardCut, unsigned int index) const override; }; diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.h b/src/plugins/Visual/projectm/visualprojectmfactory.h index bd348c886..377042197 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.h +++ b/src/plugins/Visual/projectm/visualprojectmfactory.h @@ -34,11 +34,11 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.VisualFactoryInterface.1.0") Q_INTERFACES(VisualFactory) public: - VisualProperties properties() const; - Visual *create(QWidget *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QString translation() const; + VisualProperties properties() const override; + Visual *create(QWidget *parent) override; + QDialog *createConfigDialog(QWidget *parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; |