Add missing override and remove redundant virtual

Change-Id: Ifd439abf21877adff57080489324bea729ee5279
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

6 files changed, 67 insertions, 67 deletions

diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp
index 3768fd196..e4918edf2 100644
--- a/src/multimedia/audio/qaudiobuffer.cpp
+++ b/src/multimedia/audio/qaudiobuffer.cpp
@@ -140,15 +140,15 @@ public:
             free(mBuffer);
     }
 
-    void release() {delete this;}
-    QAudioFormat format() const {return mFormat;}
-    qint64 startTime() const {return mStartTime;}
-    int frameCount() const {return mFrameCount;}
+    void release() override {delete this;}
+    QAudioFormat format() const override {return mFormat;}
+    qint64 startTime() const override {return mStartTime;}
+    int frameCount() const override {return mFrameCount;}
 
-    void *constData() const {return mBuffer;}
+    void *constData() const override {return mBuffer;}
 
-    void *writableData() {return mBuffer;}
-    QAbstractAudioBuffer *clone() const
+    void *writableData() override {return mBuffer;}
+    QAbstractAudioBuffer *clone() const override
     {
         return new QMemoryAudioBufferProvider(mBuffer, mFrameCount, mFormat, mStartTime);
     }
diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h
index a63a6836f..85e0b75f7 100644
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -120,8 +120,8 @@ Q_SIGNALS:
     void durationChanged(qint64 duration);
 
 public:
-    virtual bool bind(QObject *);
-    virtual void unbind(QObject *);
+    bool bind(QObject *) override;
+    void unbind(QObject *) override;
 
 private:
     Q_DISABLE_COPY(QAudioDecoder)
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index c3e4929b3..b1788f28a 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -61,64 +61,64 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, audioLoader,
 class QNullDeviceInfo : public QAbstractAudioDeviceInfo
 {
 public:
-    QAudioFormat preferredFormat() const { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); }
-    bool isFormatSupported(const QAudioFormat& ) const { return false; }
+    QAudioFormat preferredFormat() const override { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); }
+    bool isFormatSupported(const QAudioFormat& ) const override { return false; }
     QAudioFormat nearestFormat(const QAudioFormat& ) const { return QAudioFormat(); }
-    QString deviceName() const { return QString(); }
-    QStringList supportedCodecs() { return QStringList(); }
-    QList<int> supportedSampleRates()  { return QList<int>(); }
-    QList<int> supportedChannelCounts() { return QList<int>(); }
-    QList<int> supportedSampleSizes() { return QList<int>(); }
-    QList<QAudioFormat::Endian> supportedByteOrders() { return QList<QAudioFormat::Endian>(); }
-    QList<QAudioFormat::SampleType> supportedSampleTypes() { return QList<QAudioFormat::SampleType>(); }
+    QString deviceName() const override { return QString(); }
+    QStringList supportedCodecs() override { return QStringList(); }
+    QList<int> supportedSampleRates() override  { return QList<int>(); }
+    QList<int> supportedChannelCounts() override { return QList<int>(); }
+    QList<int> supportedSampleSizes() override { return QList<int>(); }
+    QList<QAudioFormat::Endian> supportedByteOrders() override { return QList<QAudioFormat::Endian>(); }
+    QList<QAudioFormat::SampleType> supportedSampleTypes() override { return QList<QAudioFormat::SampleType>(); }
 };
 
 class QNullInputDevice : public QAbstractAudioInput
 {
 public:
-    void start(QIODevice*) { qWarning()<<"using null input device, none available";}
-    QIODevice* start() { qWarning()<<"using null input device, none available"; return 0; }
-    void stop() {}
-    void reset() {}
-    void suspend() {}
-    void resume() {}
-    int bytesReady() const { return 0; }
-    int periodSize() const { return 0; }
-    void setBufferSize(int ) {}
-    int bufferSize() const  { return 0; }
-    void setNotifyInterval(int ) {}
-    int notifyInterval() const { return 0; }
-    qint64 processedUSecs() const { return 0; }
-    qint64 elapsedUSecs() const { return 0; }
-    QAudio::Error error() const { return QAudio::OpenError; }
-    QAudio::State state() const { return QAudio::StoppedState; }
-    void setFormat(const QAudioFormat&) {}
-    QAudioFormat format() const { return QAudioFormat(); }
-    void setVolume(qreal) {}
-    qreal volume() const {return 1.0f;}
+    void start(QIODevice*) override { qWarning()<<"using null input device, none available";}
+    QIODevice* start() override { qWarning()<<"using null input device, none available"; return 0; }
+    void stop() override {}
+    void reset() override {}
+    void suspend() override {}
+    void resume() override {}
+    int bytesReady() const override { return 0; }
+    int periodSize() const override { return 0; }
+    void setBufferSize(int ) override {}
+    int bufferSize() const override  { return 0; }
+    void setNotifyInterval(int ) override {}
+    int notifyInterval() const override { return 0; }
+    qint64 processedUSecs() const override { return 0; }
+    qint64 elapsedUSecs() const override { return 0; }
+    QAudio::Error error() const override { return QAudio::OpenError; }
+    QAudio::State state() const override { return QAudio::StoppedState; }
+    void setFormat(const QAudioFormat&) override {}
+    QAudioFormat format() const override { return QAudioFormat(); }
+    void setVolume(qreal) override {}
+    qreal volume() const override {return 1.0f;}
 };
 
 class QNullOutputDevice : public QAbstractAudioOutput
 {
 public:
-    void start(QIODevice*) {qWarning()<<"using null output device, none available";}
-    QIODevice* start() { qWarning()<<"using null output device, none available"; return 0; }
-    void stop() {}
-    void reset() {}
-    void suspend() {}
-    void resume() {}
-    int bytesFree() const { return 0; }
-    int periodSize() const { return 0; }
-    void setBufferSize(int ) {}
-    int bufferSize() const  { return 0; }
-    void setNotifyInterval(int ) {}
-    int notifyInterval() const { return 0; }
-    qint64 processedUSecs() const { return 0; }
-    qint64 elapsedUSecs() const { return 0; }
-    QAudio::Error error() const { return QAudio::OpenError; }
-    QAudio::State state() const { return QAudio::StoppedState; }
-    void setFormat(const QAudioFormat&) {}
-    QAudioFormat format() const { return QAudioFormat(); }
+    void start(QIODevice*) override {qWarning()<<"using null output device, none available";}
+    QIODevice* start() override { qWarning()<<"using null output device, none available"; return 0; }
+    void stop() override {}
+    void reset() override {}
+    void suspend() override {}
+    void resume() override {}
+    int bytesFree() const override { return 0; }
+    int periodSize() const override { return 0; }
+    void setBufferSize(int ) override {}
+    int bufferSize() const override  { return 0; }
+    void setNotifyInterval(int ) override {}
+    int notifyInterval() const override { return 0; }
+    qint64 processedUSecs() const override { return 0; }
+    qint64 elapsedUSecs() const override { return 0; }
+    QAudio::Error error() const override { return QAudio::OpenError; }
+    QAudio::State state() const override { return QAudio::StoppedState; }
+    void setFormat(const QAudioFormat&) override {}
+    QAudioFormat format() const override { return QAudioFormat(); }
 };
 
 QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index 3368c9b98..e304f1c46 100644
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -81,10 +81,10 @@ public:
     explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR);
     ~QAudioSystemPlugin();
 
-    virtual QList<QByteArray> availableDevices(QAudio::Mode) const = 0;
-    virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0;
-    virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0;
-    virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) = 0;
+    QList<QByteArray> availableDevices(QAudio::Mode) const override = 0;
+    QAbstractAudioInput* createInput(const QByteArray& device) override = 0;
+    QAbstractAudioOutput* createOutput(const QByteArray& device) override = 0;
+    QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) override = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.h b/src/multimedia/audio/qsoundeffect_qaudio_p.h
index d8c416fdb..6fc3ae8d5 100644
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.h
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.h
@@ -69,8 +69,8 @@ public:
     PrivateSoundSource(QSoundEffectPrivate* s);
     ~PrivateSoundSource() {}
 
-    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 Q_SLOTS:
     void sampleReady();
diff --git a/src/multimedia/audio/qwavedecoder_p.h b/src/multimedia/audio/qwavedecoder_p.h
index 1cd20e07f..0f1cef599 100644
--- a/src/multimedia/audio/qwavedecoder_p.h
+++ b/src/multimedia/audio/qwavedecoder_p.h
@@ -70,9 +70,9 @@ public:
     QAudioFormat audioFormat() const;
     int duration() const;
 
-    qint64 size() const;
-    bool isSequential() const;
-    qint64 bytesAvailable() const;
+    qint64 size() const override;
+    bool isSequential() const override;
+    qint64 bytesAvailable() const override;
 
 Q_SIGNALS:
     void formatKnown();
@@ -82,8 +82,8 @@ private Q_SLOTS:
     void handleData();
 
 private:
-    qint64 readData(char *data, qint64 maxlen);
-    qint64 writeData(const char *data, qint64 len);
+    qint64 readData(char *data, qint64 maxlen) override;
+    qint64 writeData(const char *data, qint64 len) override;
 
     bool enoughDataAvailable();
     bool findChunk(const char *chunkId);