Replace Q_DECL_OVERRIDE with override

Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 33 insertions, 33 deletions

diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
index d6ec63af8..04f728a59 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
@@ -54,24 +54,24 @@ class QAndroidMediaPlayerControl : public QMediaPlayerControl
     Q_OBJECT
 public:
     explicit QAndroidMediaPlayerControl(QObject *parent = 0);
-    ~QAndroidMediaPlayerControl() Q_DECL_OVERRIDE;
+    ~QAndroidMediaPlayerControl() override;
 
-    QMediaPlayer::State state() const Q_DECL_OVERRIDE;
-    QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE;
-    qint64 duration() const Q_DECL_OVERRIDE;
-    qint64 position() const Q_DECL_OVERRIDE;
-    int volume() const Q_DECL_OVERRIDE;
-    bool isMuted() const Q_DECL_OVERRIDE;
-    int bufferStatus() const Q_DECL_OVERRIDE;
-    bool isAudioAvailable() const Q_DECL_OVERRIDE;
-    bool isVideoAvailable() const Q_DECL_OVERRIDE;
-    bool isSeekable() const Q_DECL_OVERRIDE;
-    QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE;
-    qreal playbackRate() const Q_DECL_OVERRIDE;
-    void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE;
-    QMediaContent media() const Q_DECL_OVERRIDE;
-    const QIODevice *mediaStream() const Q_DECL_OVERRIDE;
-    void setMedia(const QMediaContent &mediaContent, QIODevice *stream) Q_DECL_OVERRIDE;
+    QMediaPlayer::State state() const override;
+    QMediaPlayer::MediaStatus mediaStatus() const override;
+    qint64 duration() const override;
+    qint64 position() const override;
+    int volume() const override;
+    bool isMuted() const override;
+    int bufferStatus() const override;
+    bool isAudioAvailable() const override;
+    bool isVideoAvailable() const override;
+    bool isSeekable() const override;
+    QMediaTimeRange availablePlaybackRanges() const override;
+    qreal playbackRate() const override;
+    void setPlaybackRate(qreal rate) override;
+    QMediaContent media() const override;
+    const QIODevice *mediaStream() const override;
+    void setMedia(const QMediaContent &mediaContent, QIODevice *stream) override;
 
     void setVideoOutput(QAndroidVideoOutput *videoOutput);
 
@@ -79,12 +79,12 @@ Q_SIGNALS:
     void metaDataUpdated();
 
 public Q_SLOTS:
-    void setPosition(qint64 position) Q_DECL_OVERRIDE;
-    void play() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void setVolume(int volume) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
+    void setPosition(qint64 position) override;
+    void play() override;
+    void pause() override;
+    void stop() override;
+    void setVolume(int volume) override;
+    void setMuted(bool muted) override;
 
 private Q_SLOTS:
     void onVideoOutputReady(bool ready);
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
index 2f01d986f..ef213cc57 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
@@ -52,10 +52,10 @@ class QAndroidMediaPlayerVideoRendererControl : public QVideoRendererControl
     Q_OBJECT
 public:
     QAndroidMediaPlayerVideoRendererControl(QAndroidMediaPlayerControl *mediaPlayer, QObject *parent = 0);
-    ~QAndroidMediaPlayerVideoRendererControl() Q_DECL_OVERRIDE;
+    ~QAndroidMediaPlayerVideoRendererControl() override;
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
 private:
     QAndroidMediaPlayerControl *m_mediaPlayerControl;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h b/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
index f81078d0f..f78d05ddd 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
@@ -53,10 +53,10 @@ class QAndroidMediaService : public QMediaService
     Q_OBJECT
 public:
     explicit QAndroidMediaService(QObject *parent = 0);
-    ~QAndroidMediaService() Q_DECL_OVERRIDE;
+    ~QAndroidMediaService() override;
 
-    QMediaControl* requestControl(const char *name) Q_DECL_OVERRIDE;
-    void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE;
+    QMediaControl* requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
 private:
     QAndroidMediaPlayerControl *mMediaControl;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
index 4354eb54e..f2b1b47f1 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
@@ -53,12 +53,12 @@ class QAndroidMetaDataReaderControl : public QMetaDataReaderControl
     Q_OBJECT
 public:
     explicit QAndroidMetaDataReaderControl(QObject *parent = 0);
-    ~QAndroidMetaDataReaderControl() Q_DECL_OVERRIDE;
+    ~QAndroidMetaDataReaderControl() override;
 
-    bool isMetaDataAvailable() const Q_DECL_OVERRIDE;
+    bool isMetaDataAvailable() const override;
 
-    QVariant metaData(const QString &key) const Q_DECL_OVERRIDE;
-    QStringList availableMetaData() const Q_DECL_OVERRIDE;
+    QVariant metaData(const QString &key) const override;
+    QStringList availableMetaData() const override;
 
 public Q_SLOTS:
     void onMediaChanged(const QMediaContent &media);