summaryrefslogtreecommitdiffstats
path: root/src/plugins/wasapi
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-09-20 20:57:43 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-22 14:31:24 +0000
commitc4274f6e98e29c1399120bdd8db86770d6bba104 (patch)
tree9c3e905386cd9bf6b01e32cc1835d7263eb9070d /src/plugins/wasapi
parentbb6166a5eca14550584bfc4ab4cb4130872df3ad (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/wasapi')
-rw-r--r--src/plugins/wasapi/qwasapiaudiodeviceinfo.h18
-rw-r--r--src/plugins/wasapi/qwasapiaudioinput.h40
-rw-r--r--src/plugins/wasapi/qwasapiaudiooutput.h40
-rw-r--r--src/plugins/wasapi/qwasapiplugin.h10
4 files changed, 54 insertions, 54 deletions
diff --git a/src/plugins/wasapi/qwasapiaudiodeviceinfo.h b/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
index 97966c171..878d0273a 100644
--- a/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
+++ b/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
@@ -61,15 +61,15 @@ public:
explicit QWasapiAudioDeviceInfo(QByteArray dev,QAudio::Mode mode);
~QWasapiAudioDeviceInfo();
- QAudioFormat preferredFormat() const Q_DECL_OVERRIDE;
- bool isFormatSupported(const QAudioFormat& format) const Q_DECL_OVERRIDE;
- QString deviceName() const Q_DECL_OVERRIDE;
- QStringList supportedCodecs() Q_DECL_OVERRIDE;
- QList<int> supportedSampleRates() Q_DECL_OVERRIDE;
- QList<int> supportedChannelCounts() Q_DECL_OVERRIDE;
- QList<int> supportedSampleSizes() Q_DECL_OVERRIDE;
- QList<QAudioFormat::Endian> supportedByteOrders() Q_DECL_OVERRIDE;
- QList<QAudioFormat::SampleType> supportedSampleTypes() Q_DECL_OVERRIDE;
+ QAudioFormat preferredFormat() const override;
+ bool isFormatSupported(const QAudioFormat& format) const override;
+ QString deviceName() const override;
+ QStringList supportedCodecs() override;
+ QList<int> supportedSampleRates() override;
+ QList<int> supportedChannelCounts() override;
+ QList<int> supportedSampleSizes() override;
+ QList<QAudioFormat::Endian> supportedByteOrders() override;
+ QList<QAudioFormat::SampleType> supportedSampleTypes() override;
private:
Microsoft::WRL::ComPtr<AudioInterface> m_interface;
diff --git a/src/plugins/wasapi/qwasapiaudioinput.h b/src/plugins/wasapi/qwasapiaudioinput.h
index 34ede06b7..babfb5b10 100644
--- a/src/plugins/wasapi/qwasapiaudioinput.h
+++ b/src/plugins/wasapi/qwasapiaudioinput.h
@@ -66,26 +66,26 @@ public:
explicit QWasapiAudioInput(const QByteArray &device);
~QWasapiAudioInput();
- void start(QIODevice* device) Q_DECL_OVERRIDE;
- QIODevice* start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
- void reset() Q_DECL_OVERRIDE;
- void suspend() Q_DECL_OVERRIDE;
- void resume() Q_DECL_OVERRIDE;
- int bytesReady() const Q_DECL_OVERRIDE;
- int periodSize() const Q_DECL_OVERRIDE;
- void setBufferSize(int value) Q_DECL_OVERRIDE;
- int bufferSize() const Q_DECL_OVERRIDE;
- void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
- int notifyInterval() const Q_DECL_OVERRIDE;
- qint64 processedUSecs() const Q_DECL_OVERRIDE;
- qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
- QAudio::Error error() const Q_DECL_OVERRIDE;
- QAudio::State state() const Q_DECL_OVERRIDE;
- void setFormat(const QAudioFormat& fmt) Q_DECL_OVERRIDE;
- QAudioFormat format() const Q_DECL_OVERRIDE;
- void setVolume(qreal) Q_DECL_OVERRIDE;
- qreal volume() const Q_DECL_OVERRIDE;
+ 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;
void process();
public slots:
diff --git a/src/plugins/wasapi/qwasapiaudiooutput.h b/src/plugins/wasapi/qwasapiaudiooutput.h
index 02974071b..49219c5cc 100644
--- a/src/plugins/wasapi/qwasapiaudiooutput.h
+++ b/src/plugins/wasapi/qwasapiaudiooutput.h
@@ -67,26 +67,26 @@ public:
explicit QWasapiAudioOutput(const QByteArray &device);
~QWasapiAudioOutput();
- void start(QIODevice* device) Q_DECL_OVERRIDE;
- QIODevice* start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
- void reset() Q_DECL_OVERRIDE;
- void suspend() Q_DECL_OVERRIDE;
- void resume() Q_DECL_OVERRIDE;
- int bytesFree() const Q_DECL_OVERRIDE;
- int periodSize() const Q_DECL_OVERRIDE;
- void setBufferSize(int value) Q_DECL_OVERRIDE;
- int bufferSize() const Q_DECL_OVERRIDE;
- void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
- int notifyInterval() const Q_DECL_OVERRIDE;
- qint64 processedUSecs() const Q_DECL_OVERRIDE;
- qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
- QAudio::Error error() const Q_DECL_OVERRIDE;
- QAudio::State state() const Q_DECL_OVERRIDE;
- void setFormat(const QAudioFormat& fmt) Q_DECL_OVERRIDE;
- QAudioFormat format() const Q_DECL_OVERRIDE;
- void setVolume(qreal) Q_DECL_OVERRIDE;
- qreal volume() const Q_DECL_OVERRIDE;
+ 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;
void process();
public slots:
diff --git a/src/plugins/wasapi/qwasapiplugin.h b/src/plugins/wasapi/qwasapiplugin.h
index e69e7895f..7b20676f6 100644
--- a/src/plugins/wasapi/qwasapiplugin.h
+++ b/src/plugins/wasapi/qwasapiplugin.h
@@ -60,11 +60,11 @@ public:
explicit QWasapiPlugin(QObject *parent = 0);
~QWasapiPlugin() {}
- QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
- QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
- QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
- QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
- QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+ QByteArray defaultDevice(QAudio::Mode mode) const override;
+ QList<QByteArray> 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:
QList<QByteArray> m_deviceNames;