Fix inconsistent overrides. [-Winconsistent-missing-override]
authorSergio Martins <sergio.martins@kdab.com>
Thu, 19 Mar 2015 21:18:44 +0000 (21:18 +0000)
committerSérgio Martins <sergio.martins@kdab.com>
Sun, 22 Mar 2015 19:56:47 +0000 (19:56 +0000)
Change-Id: Icb3e2a640c122424704a8e4b10172ecc7602845a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h

index 35a8afd..cb1168e 100644 (file)
@@ -57,14 +57,14 @@ public:
     QDeclarativeVideoRendererBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoRendererBackend();
 
-    bool init(QMediaService *service);
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData);
-    void releaseSource();
-    void releaseControl();
-    QSize nativeSize() const;
-    void updateGeometry();
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data);
-    QAbstractVideoSurface *videoSurface() const;
+    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;
     QOpenGLContext *glContext() const;
 
index 0cec2e2..446ce52 100644 (file)
@@ -46,14 +46,14 @@ public:
     QDeclarativeVideoWindowBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoWindowBackend();
 
-    bool init(QMediaService *service);
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData);
-    void releaseSource();
-    void releaseControl();
-    QSize nativeSize() const;
-    void updateGeometry();
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data);
-    QAbstractVideoSurface *videoSurface() const;
+    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;
 
 private: