diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2015-03-19 21:18:44 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-03-22 19:56:47 +0000 |
| commit | 08058f8483bd1a681edc9aa0d31d3d28a96349b7 (patch) | |
| tree | b8323858a6eafc76396ece3f92aa022abc0be43a /src/qtmultimediaquicktools | |
| parent | 71fc289373f5f77ea08eca1b1803b508310c03ab (diff) | |
Fix inconsistent overrides. [-Winconsistent-missing-override]
Change-Id: Icb3e2a640c122424704a8e4b10172ecc7602845a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/qtmultimediaquicktools')
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h | 16 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h index 35a8afdc4..cb1168ee9 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h @@ -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; diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h index 0cec2e206..446ce52cd 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h @@ -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: |