From b9e09bd2280f58a07476b1faf9f24127915aaed9 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 6 Jan 2019 20:09:02 +0000 Subject: using override keyword git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8592 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/rdetect/removablehelper.h | 2 +- src/plugins/Output/directsound/outputdirectsound.h | 18 +++++++++--------- .../Output/directsound/outputdirectsoundfactory.h | 8 ++++---- src/plugins/Output/wasapi/outputwasapi.h | 18 +++++++++--------- src/plugins/Output/wasapi/outputwasapifactory.h | 8 ++++---- src/plugins/Output/waveout/outputwaveout.h | 18 +++++++++--------- src/plugins/Output/waveout/outputwaveoutfactory.h | 8 ++++---- 7 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/plugins/General/rdetect/removablehelper.h b/src/plugins/General/rdetect/removablehelper.h index 4b37775b9..f5c0b8736 100644 --- a/src/plugins/General/rdetect/removablehelper.h +++ b/src/plugins/General/rdetect/removablehelper.h @@ -33,7 +33,7 @@ public: explicit RemovableHelper(QObject *parent = nullptr); ~RemovableHelper(); - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; private slots: void processAction(QAction *action); diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h index acd07fa24..c24bb0c93 100644 --- a/src/plugins/Output/directsound/outputdirectsound.h +++ b/src/plugins/Output/directsound/outputdirectsound.h @@ -40,15 +40,15 @@ public: OutputDirectSound(); ~OutputDirectSound(); - 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 size); - void drain(); - void suspend(); - void resume(); - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 size) override; + void drain() override; + void suspend() override; + void resume() override; + void reset() override; //volume control static OutputDirectSound *instance; @@ -88,8 +88,8 @@ public: VolumeDirectSound(); ~VolumeDirectSound(); - 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/directsound/outputdirectsoundfactory.h b/src/plugins/Output/directsound/outputdirectsoundfactory.h index 700aaca24..0ff4acf6c 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.h +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.h @@ -34,10 +34,10 @@ 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); + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; void showAbout(QWidget *parent) override; QString translation() const override; }; diff --git a/src/plugins/Output/wasapi/outputwasapi.h b/src/plugins/Output/wasapi/outputwasapi.h index ffe07669f..10fd10cee 100644 --- a/src/plugins/Output/wasapi/outputwasapi.h +++ b/src/plugins/Output/wasapi/outputwasapi.h @@ -39,15 +39,15 @@ public: OutputWASAPI(); ~OutputWASAPI(); - 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 size); - void drain(); - void suspend(); - void resume(); - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 size) override; + void drain() override; + void suspend() override; + void resume() override; + void reset() override; //volume control ISimpleAudioVolume *simpleAudioVolume(); @@ -89,8 +89,8 @@ public: VolumeWASAPI(); ~VolumeWASAPI(); - 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/wasapi/outputwasapifactory.h b/src/plugins/Output/wasapi/outputwasapifactory.h index 850968854..c712a072d 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.h +++ b/src/plugins/Output/wasapi/outputwasapifactory.h @@ -34,10 +34,10 @@ 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); + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; void showAbout(QWidget *parent) override; QString translation() const override; }; diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h index 252f446c8..b051675dc 100644 --- a/src/plugins/Output/waveout/outputwaveout.h +++ b/src/plugins/Output/waveout/outputwaveout.h @@ -35,15 +35,15 @@ public: OutputWaveOut(); ~OutputWaveOut(); - 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 size); - void drain(); - void suspend(); - void resume(); - void reset(); + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 size) override; + void drain() override; + void suspend() override; + void resume() override; + void reset() override; private: // helper functions @@ -59,8 +59,8 @@ public: VolumeWaveOut(); ~VolumeWaveOut(); - void setVolume(const VolumeSettings &vol); - VolumeSettings volume() const; + void setVolume(const VolumeSettings &vol) override; + VolumeSettings volume() const override; bool isSupported() const; }; diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index c8bb4c5f8..4c58886a1 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -35,10 +35,10 @@ 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); + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; void showAbout(QWidget *parent) override; QString translation() const override; }; -- cgit v1.2.3-13-gbd6f