From 485eec9556d86c3428b47b9773ebe253d2a085cc Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 20 May 2020 17:57:53 +0300 Subject: Add missing override Change-Id: I0ec719a26ad6c146e44f8e9e41b186a53cb254a9 Reviewed-by: VaL Doroshchuk (cherry picked from commit 121c0c4028d6deceded8e600959f10c364986634) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/alsa/qalsaaudiodeviceinfo.h | 18 ++++----- src/plugins/alsa/qalsaaudioinput.h | 44 ++++++++++----------- src/plugins/alsa/qalsaaudiooutput.h | 44 ++++++++++----------- src/plugins/m3u/qm3uhandler.cpp | 10 ++--- src/plugins/m3u/qm3uhandler.h | 12 +++--- src/plugins/pulseaudio/qaudiodeviceinfo_pulse.h | 18 ++++----- src/plugins/pulseaudio/qaudioinput_pulse.h | 46 +++++++++++----------- src/plugins/pulseaudio/qaudiooutput_pulse.h | 52 ++++++++++++------------- src/plugins/pulseaudio/qpulseaudioplugin.h | 10 ++--- 9 files changed, 127 insertions(+), 127 deletions(-) (limited to 'src') diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.h b/src/plugins/alsa/qalsaaudiodeviceinfo.h index 65675df54..cdf08bfab 100644 --- a/src/plugins/alsa/qalsaaudiodeviceinfo.h +++ b/src/plugins/alsa/qalsaaudiodeviceinfo.h @@ -79,15 +79,15 @@ public: bool testSettings(const QAudioFormat& format) const; void updateLists(); - QAudioFormat preferredFormat() const; - bool isFormatSupported(const QAudioFormat& format) const; - QString deviceName() const; - QStringList supportedCodecs(); - QList supportedSampleRates(); - QList supportedChannelCounts(); - QList supportedSampleSizes(); - QList supportedByteOrders(); - QList supportedSampleTypes(); + QAudioFormat preferredFormat() const override; + bool isFormatSupported(const QAudioFormat& format) const override; + QString deviceName() const override; + QStringList supportedCodecs() override; + QList supportedSampleRates() override; + QList supportedChannelCounts() override; + QList supportedSampleSizes() override; + QList supportedByteOrders() override; + QList supportedSampleTypes() override; static QByteArray defaultDevice(QAudio::Mode mode); static QList availableDevices(QAudio::Mode); static QString deviceFromCardName(const QString &card); diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h index fa9c954d7..62e1be039 100644 --- a/src/plugins/alsa/qalsaaudioinput.h +++ b/src/plugins/alsa/qalsaaudioinput.h @@ -103,26 +103,26 @@ public: qint64 read(char* data, qint64 len); - void start(QIODevice* device); - QIODevice* start(); - void stop(); - void reset(); - void suspend(); - void resume(); - int bytesReady() const; - int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; - void setNotifyInterval(int milliSeconds); - int notifyInterval() const; - qint64 processedUSecs() const; - qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; - void setFormat(const QAudioFormat& fmt); - QAudioFormat format() const; - void setVolume(qreal); - qreal volume() const; + void start(QIODevice* device) override; + QIODevice* start() override; + void stop() override; + void reset() override; + void suspend() override; + void resume() override; + int bytesReady() const override; + int periodSize() const override; + void setBufferSize(int value) override; + int bufferSize() const override; + void setNotifyInterval(int milliSeconds) override; + int notifyInterval() const override; + qint64 processedUSecs() const override; + qint64 elapsedUSecs() const override; + QAudio::Error error() const override; + QAudio::State state() const override; + void setFormat(const QAudioFormat& fmt) override; + QAudioFormat format() const override; + void setVolume(qreal) override; + qreal volume() const override; bool resuming; snd_pcm_t* handle; qint64 totalTimeValue; @@ -171,8 +171,8 @@ public: AlsaInputPrivate(QAlsaAudioInput* audio); ~AlsaInputPrivate(); - qint64 readData( char* data, qint64 len); - qint64 writeData(const char* data, qint64 len); + qint64 readData( char* data, qint64 len) override; + qint64 writeData(const char* data, qint64 len) override; void trigger(); private: diff --git a/src/plugins/alsa/qalsaaudiooutput.h b/src/plugins/alsa/qalsaaudiooutput.h index 8002322cb..72b9c2e4c 100644 --- a/src/plugins/alsa/qalsaaudiooutput.h +++ b/src/plugins/alsa/qalsaaudiooutput.h @@ -77,26 +77,26 @@ public: qint64 write( const char *data, qint64 len ); - void start(QIODevice* device); - QIODevice* start(); - void stop(); - void reset(); - void suspend(); - void resume(); - int bytesFree() const; - int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; - void setNotifyInterval(int milliSeconds); - int notifyInterval() const; - qint64 processedUSecs() const; - qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; - void setFormat(const QAudioFormat& fmt); - QAudioFormat format() const; - void setVolume(qreal); - qreal volume() const; + void start(QIODevice* device) override; + QIODevice* start() override; + void stop() override; + void reset() override; + void suspend() override; + void resume() override; + int bytesFree() const override; + int periodSize() const override; + void setBufferSize(int value) override; + int bufferSize() const override; + void setNotifyInterval(int milliSeconds) override; + int notifyInterval() const override; + qint64 processedUSecs() const override; + qint64 elapsedUSecs() const override; + QAudio::Error error() const override; + QAudio::State state() const override; + void setFormat(const QAudioFormat& fmt) override; + QAudioFormat format() const override; + void setVolume(qreal) override; + qreal volume() const override; QIODevice* audioSource; @@ -151,8 +151,8 @@ public: AlsaOutputPrivate(QAlsaAudioOutput* audio); ~AlsaOutputPrivate(); - qint64 readData( char* data, qint64 len); - qint64 writeData(const char* data, qint64 len); + qint64 readData( char* data, qint64 len) override; + qint64 writeData(const char* data, qint64 len) override; private: QAlsaAudioOutput *audioDevice; diff --git a/src/plugins/m3u/qm3uhandler.cpp b/src/plugins/m3u/qm3uhandler.cpp index 5e05994ef..c621a181e 100644 --- a/src/plugins/m3u/qm3uhandler.cpp +++ b/src/plugins/m3u/qm3uhandler.cpp @@ -78,14 +78,14 @@ public: delete m_textStream; } - virtual bool atEnd() const + bool atEnd() const override { //we can't just use m_textStream->atEnd(), //for files with empty lines/comments at end return nextResource.isNull(); } - virtual QMediaContent readItem() + QMediaContent readItem() override { QMediaContent item; if (!nextResource.isNull()) @@ -136,7 +136,7 @@ public: return item; } - virtual void close() + void close() override { } @@ -161,13 +161,13 @@ public: delete m_textStream; } - virtual bool writeItem(const QMediaContent& item) + bool writeItem(const QMediaContent& item) override { *m_textStream << item.request().url().toString() << Qt::endl; return true; } - virtual void close() + void close() override { } diff --git a/src/plugins/m3u/qm3uhandler.h b/src/plugins/m3u/qm3uhandler.h index 509ac11d5..1bc0684d3 100644 --- a/src/plugins/m3u/qm3uhandler.h +++ b/src/plugins/m3u/qm3uhandler.h @@ -54,15 +54,15 @@ public: explicit QM3uPlaylistPlugin(QObject *parent = 0); virtual ~QM3uPlaylistPlugin(); - virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const; - virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const; + bool canRead(QIODevice *device, const QByteArray &format = QByteArray()) const override; + bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const override; - virtual bool canWrite(QIODevice *device, const QByteArray &format) const; + bool canWrite(QIODevice *device, const QByteArray &format) const override; - virtual QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()); - virtual QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()); + QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) override; + QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) override; - virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format); + QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) override; }; #endif // QM3UHANDLER_H diff --git a/src/plugins/pulseaudio/qaudiodeviceinfo_pulse.h b/src/plugins/pulseaudio/qaudiodeviceinfo_pulse.h index 64537229f..1cec772c0 100644 --- a/src/plugins/pulseaudio/qaudiodeviceinfo_pulse.h +++ b/src/plugins/pulseaudio/qaudiodeviceinfo_pulse.h @@ -69,15 +69,15 @@ public: QPulseAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode); ~QPulseAudioDeviceInfo() {} - QAudioFormat preferredFormat() const; - bool isFormatSupported(const QAudioFormat &format) const; - QString deviceName() const; - QStringList supportedCodecs(); - QList supportedSampleRates(); - QList supportedChannelCounts(); - QList supportedSampleSizes(); - QList supportedByteOrders(); - QList supportedSampleTypes(); + QAudioFormat preferredFormat() const override; + bool isFormatSupported(const QAudioFormat &format) const override; + QString deviceName() const override; + QStringList supportedCodecs() override; + QList supportedSampleRates() override; + QList supportedChannelCounts() override; + QList supportedSampleSizes() override; + QList supportedByteOrders() override; + QList supportedSampleTypes() override; private: QByteArray m_device; diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.h b/src/plugins/pulseaudio/qaudioinput_pulse.h index 3a6cf03c4..dce212a25 100644 --- a/src/plugins/pulseaudio/qaudioinput_pulse.h +++ b/src/plugins/pulseaudio/qaudioinput_pulse.h @@ -78,27 +78,27 @@ public: qint64 read(char *data, qint64 len); - void start(QIODevice *device); - QIODevice *start(); - void stop(); - void reset(); - void suspend(); - void resume(); - int bytesReady() const; - int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; - void setNotifyInterval(int milliSeconds); - int notifyInterval() const; - qint64 processedUSecs() const; - qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; - void setFormat(const QAudioFormat &format); - QAudioFormat format() const; - - void setVolume(qreal volume); - qreal volume() const; + void start(QIODevice *device) override; + QIODevice *start() override; + void stop() override; + void reset() override; + void suspend() override; + void resume() override; + int bytesReady() const override; + int periodSize() const override; + void setBufferSize(int value) override; + int bufferSize() const override; + void setNotifyInterval(int milliSeconds) override; + int notifyInterval() const override; + qint64 processedUSecs() const override; + qint64 elapsedUSecs() const override; + QAudio::Error error() const override; + QAudio::State state() const override; + void setFormat(const QAudioFormat &format) override; + QAudioFormat format() const override; + + void setVolume(qreal volume) override; + qreal volume() const override; qint64 m_totalTimeValue; QIODevice *m_audioSource; @@ -147,8 +147,8 @@ public: PulseInputPrivate(QPulseAudioInput *audio); ~PulseInputPrivate() {}; - qint64 readData(char *data, qint64 len); - qint64 writeData(const char *data, qint64 len); + qint64 readData(char *data, qint64 len) override; + qint64 writeData(const char *data, qint64 len) override; void trigger(); diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.h b/src/plugins/pulseaudio/qaudiooutput_pulse.h index 40d052681..e11f2ab2f 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.h +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.h @@ -75,30 +75,30 @@ public: QPulseAudioOutput(const QByteArray &device); ~QPulseAudioOutput(); - void start(QIODevice *device); - QIODevice *start(); - void stop(); - void reset(); - void suspend(); - void resume(); - int bytesFree() const; - int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; - void setNotifyInterval(int milliSeconds); - int notifyInterval() const; - qint64 processedUSecs() const; - qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; - void setFormat(const QAudioFormat &format); - QAudioFormat format() const; - - void setVolume(qreal volume); - qreal volume() const; - - void setCategory(const QString &category); - QString category() const; + void start(QIODevice *device) override; + QIODevice *start() override; + void stop() override; + void reset() override; + void suspend() override; + void resume() override; + int bytesFree() const override; + int periodSize() const override; + void setBufferSize(int value) override; + int bufferSize() const override; + void setNotifyInterval(int milliSeconds) override; + int notifyInterval() const override; + qint64 processedUSecs() const override; + qint64 elapsedUSecs() const override; + QAudio::Error error() const override; + QAudio::State state() const override; + void setFormat(const QAudioFormat &format) override; + QAudioFormat format() const override; + + void setVolume(qreal volume) override; + qreal volume() const override; + + void setCategory(const QString &category) override; + QString category() const override; public: void streamUnderflowCallback(); @@ -154,8 +154,8 @@ public: virtual ~PulseOutputPrivate() {} protected: - qint64 readData(char *data, qint64 len); - qint64 writeData(const char *data, qint64 len); + qint64 readData(char *data, qint64 len) override; + qint64 writeData(const char *data, qint64 len) override; private: QPulseAudioOutput *m_audioDevice; diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.h b/src/plugins/pulseaudio/qpulseaudioplugin.h index 120d57df5..7d27cad48 100644 --- a/src/plugins/pulseaudio/qpulseaudioplugin.h +++ b/src/plugins/pulseaudio/qpulseaudioplugin.h @@ -58,11 +58,11 @@ public: QPulseAudioPlugin(QObject *parent = 0); ~QPulseAudioPlugin() {} - QByteArray defaultDevice(QAudio::Mode mode) const; - QList availableDevices(QAudio::Mode mode) const; - QAbstractAudioInput *createInput(const QByteArray &device); - QAbstractAudioOutput *createOutput(const QByteArray &device); - QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode); + QByteArray defaultDevice(QAudio::Mode mode) const override; + QList availableDevices(QAudio::Mode mode) const override; + QAbstractAudioInput *createInput(const QByteArray &device) override; + QAbstractAudioOutput *createOutput(const QByteArray &device) override; + QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override; private: QPulseAudioEngine *m_pulseEngine; -- cgit v1.2.3