Replace Q_DECL_OVERRIDE with override

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

4 files changed, 26 insertions, 26 deletions

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
index 412694cc3..8cd331495 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
@@ -130,7 +130,7 @@ class FilterRunnableDeleter : public QRunnable
 {
 public:
     FilterRunnableDeleter(const QList<QVideoFilterRunnable *> &runnables) : m_runnables(runnables) { }
-    void run() Q_DECL_OVERRIDE {
+    void run() override {
         for (QVideoFilterRunnable *runnable : qAsConst(m_runnables))
             delete runnable;
     }
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
index c84612960..4f1a90c8b 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
@@ -74,25 +74,25 @@ public:
     QDeclarativeVideoRendererBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoRendererBackend();
 
-    bool init(QMediaService *service) Q_DECL_OVERRIDE;
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
-    void releaseSource() Q_DECL_OVERRIDE;
-    void releaseControl() Q_DECL_OVERRIDE;
-    QSize nativeSize() const Q_DECL_OVERRIDE;
-    void updateGeometry() Q_DECL_OVERRIDE;
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
-    QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
-    QRectF adjustedViewport() const Q_DECL_OVERRIDE;
+    bool init(QMediaService *service) override;
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) override;
+    void releaseSource() override;
+    void releaseControl() override;
+    QSize nativeSize() const override;
+    void updateGeometry() override;
+    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override;
+    QAbstractVideoSurface *videoSurface() const override;
+    QRectF adjustedViewport() const override;
     QOpenGLContext *glContext() const;
 
     friend class QSGVideoItemSurface;
     void present(const QVideoFrame &frame);
     void stop();
 
-    void appendFilter(QAbstractVideoFilter *filter) Q_DECL_OVERRIDE;
-    void clearFilters() Q_DECL_OVERRIDE;
-    void releaseResources() Q_DECL_OVERRIDE;
-    void invalidateSceneGraph() Q_DECL_OVERRIDE;
+    void appendFilter(QAbstractVideoFilter *filter) override;
+    void clearFilters() override;
+    void releaseResources() override;
+    void invalidateSceneGraph() override;
 
 private:
     void scheduleDeleteFilterResources();
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
index 942cc18d9..eb1814b07 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
@@ -63,15 +63,15 @@ public:
     QDeclarativeVideoWindowBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoWindowBackend();
 
-    bool init(QMediaService *service) Q_DECL_OVERRIDE;
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
-    void releaseSource() Q_DECL_OVERRIDE;
-    void releaseControl() Q_DECL_OVERRIDE;
-    QSize nativeSize() const Q_DECL_OVERRIDE;
-    void updateGeometry() Q_DECL_OVERRIDE;
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
-    QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
-    QRectF adjustedViewport() const Q_DECL_OVERRIDE;
+    bool init(QMediaService *service) override;
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) override;
+    void releaseSource() override;
+    void releaseControl() override;
+    QSize nativeSize() const override;
+    void updateGeometry() override;
+    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override;
+    QAbstractVideoSurface *videoSurface() const override;
+    QRectF adjustedViewport() const override;
 
 private:
     QPointer<QVideoWindowControl> m_videoWindowControl;
diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
index 38b5af943..54d6dec97 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
@@ -120,9 +120,9 @@ public:
         setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/uyvyvideo.frag"));
     }
 
-    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
+    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
 
-    char const *const *attributeNames() const Q_DECL_OVERRIDE {
+    char const *const *attributeNames() const override {
         static const char *names[] = {
             "qt_VertexPosition",
             "qt_VertexTexCoord",
@@ -132,7 +132,7 @@ public:
     }
 
 protected:
-    void initialize() Q_DECL_OVERRIDE {
+    void initialize() override {
         m_id_matrix = program()->uniformLocation("qt_Matrix");
         m_id_yuvtexture = program()->uniformLocation("yuvTexture");
         m_id_imageWidth = program()->uniformLocation("imageWidth");