using override keyword

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38

39 files changed, 138 insertions, 138 deletions

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