Add missing override and remove redundant virtual

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

10 files changed, 37 insertions, 37 deletions

diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index a132af49a..f97928f9d 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -67,7 +67,7 @@ class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin
 
 public:
     QAudioEngineDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    virtual void registerTypes(const char *uri)
+    void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtAudioEngine"));
 
diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h
index 088cb3f22..c1dbf6aa2 100644
--- a/src/imports/audioengine/qaudioengine_openal_p.h
+++ b/src/imports/audioengine/qaudioengine_openal_p.h
@@ -123,28 +123,28 @@ public:
     QSoundSourcePrivate(QObject *parent);
     ~QSoundSourcePrivate();
 
-    void play();
-    void pause();
-    void stop();
+    void play() override;
+    void pause() override;
+    void stop() override;
 
-    QSoundSource::State state() const;
+    QSoundSource::State state() const override;
 
     bool isLooping() const;
-    void setLooping(bool looping);
-    void setPosition(const QVector3D& position);
-    void setDirection(const QVector3D& direction);
-    void setVelocity(const QVector3D& velocity);
+    void setLooping(bool looping) override;
+    void setPosition(const QVector3D& position) override;
+    void setDirection(const QVector3D& direction) override;
+    void setVelocity(const QVector3D& velocity) override;
 
-    QVector3D velocity() const;
-    QVector3D position() const;
-    QVector3D direction() const;
+    QVector3D velocity() const override;
+    QVector3D position() const override;
+    QVector3D direction() const override;
 
-    void setGain(qreal gain);
-    void setPitch(qreal pitch);
-    void setCone(qreal innerAngle, qreal outerAngle, qreal outerGain);
+    void setGain(qreal gain) override;
+    void setPitch(qreal pitch) override;
+    void setCone(qreal innerAngle, qreal outerAngle, qreal outerGain) override;
 
-    void bindBuffer(QSoundBuffer*);
-    void unbindBuffer();
+    void bindBuffer(QSoundBuffer*) override;
+    void unbindBuffer() override;
 
     void checkState();
 
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
index b50ed2ff5..1cec3f4ab 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
@@ -97,9 +97,9 @@ public:
     qreal endDistance() const;
     void setEndDistance(qreal endDist);
 
-    qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const;
+    qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const override;
 
-    void setEngine(QDeclarativeAudioEngine *engine);
+    void setEngine(QDeclarativeAudioEngine *engine) override;
 
 private:
     Q_DISABLE_COPY(QDeclarativeAttenuationModelLinear);
@@ -126,9 +126,9 @@ public:
     qreal rolloffFactor() const;
     void setRolloffFactor(qreal rolloffFactor);
 
-    qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const;
+    qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const override;
 
-    void setEngine(QDeclarativeAudioEngine *engine);
+    void setEngine(QDeclarativeAudioEngine *engine) override;
 
 private:
     Q_DISABLE_COPY(QDeclarativeAttenuationModelInverse);
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h
index abb379894..fd049e629 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.h
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.h
@@ -90,8 +90,8 @@ public:
     QDeclarativeAudioEngine(QObject *parent = 0);
     ~QDeclarativeAudioEngine();
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     //This is used for tracking all objects declared inside AudioEngine
     //see appendFunction
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 1b8c87cc0..6a316a298 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -85,7 +85,7 @@ class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
 
 public:
     QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    virtual void registerTypes(const char *uri)
+    void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia"));
 
@@ -155,7 +155,7 @@ public:
         qmlRegisterType<QAbstractVideoFilter>();
     }
 
-    void initializeEngine(QQmlEngine *engine, const char *uri)
+    void initializeEngine(QQmlEngine *engine, const char *uri) override
     {
         Q_UNUSED(uri);
         engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider);
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index ad30fa729..4e2b94300 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -170,8 +170,8 @@ public:
     PlaybackState playbackState() const;
     void setPlaybackState(QMediaPlayer::State playbackState);
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     QObject *mediaObject() { return m_player; }
 
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 964d30117..97afa5b53 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -336,8 +336,8 @@ private Q_SLOTS:
     void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
 
 protected:
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 private:
     Q_DISABLE_COPY(QDeclarativeCamera)
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h
index 707102bff..16a48de53 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -131,8 +131,8 @@ public:
 
     FocusZonesModel(QObject *parent = 0);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 public slots:
     void setFocusZones(const QCameraFocusZoneList &zones);
diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
index b9ac29b1e..cf5f0644c 100644
--- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -61,7 +61,7 @@ public:
     QDeclarativeCameraPreviewProvider();
     ~QDeclarativeCameraPreviewProvider();
 
-    virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize);
+    QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) override;
     static void registerPreview(const QString &id, const QImage &preview);
 };
 
diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
index 22c853605..fa221a05b 100644
--- a/src/imports/multimedia/qdeclarativeplaylist_p.h
+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
@@ -126,12 +126,12 @@ public:
     QString errorString() const;
     QMediaPlaylist *mediaPlaylist() const { return m_playlist; }
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     QQmlListProperty<QDeclarativePlaylistItem> items() {
         return QQmlListProperty<QDeclarativePlaylistItem>(