From 8a6f982632b4f4710576685a5647a771384ab29a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 6 Jan 2019 19:27:03 +0000 Subject: using override keyword git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/alsa/outputalsa.cpp | 2 +- src/plugins/Output/alsa/outputalsa.h | 22 +++++++++++----------- src/plugins/Output/alsa/outputalsafactory.h | 12 ++++++------ src/plugins/Output/alsa/settingsdialog.cpp | 2 +- src/plugins/Output/alsa/settingsdialog.h | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/plugins/Output/alsa') 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); -- cgit v1.2.3-13-gbd6f