slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix inconsistent overrides. [-Winconsistent-missing-override]

Browse Source 
Change-Id: Icb3e2a640c122424704a8e4b10172ecc7602845a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sergio Martins
2015-03-19 21:18:44 +00:00
committed by Sérgio Martins
parent 71fc289373
commit 08058f8483
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
View File

@@ -57,14 +57,14 @@ public:
QDeclarativeVideoRendererBackend(QDeclarativeVideoOutput *parent); QDeclarativeVideoRendererBackend(QDeclarativeVideoOutput *parent);
~QDeclarativeVideoRendererBackend(); ~QDeclarativeVideoRendererBackend();
bool init(QMediaService *service); bool init(QMediaService *service) Q_DECL_OVERRIDE;
void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData); void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
void releaseSource(); void releaseSource() Q_DECL_OVERRIDE;
void releaseControl(); void releaseControl() Q_DECL_OVERRIDE;
QSize nativeSize() const; QSize nativeSize() const Q_DECL_OVERRIDE;
void updateGeometry(); void updateGeometry() Q_DECL_OVERRIDE;
QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data); QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
QAbstractVideoSurface *videoSurface() const; QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
QRectF adjustedViewport() const Q_DECL_OVERRIDE; QRectF adjustedViewport() const Q_DECL_OVERRIDE;
QOpenGLContext *glContext() const; QOpenGLContext *glContext() const;

16
src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
View File

@@ -46,14 +46,14 @@ public:
QDeclarativeVideoWindowBackend(QDeclarativeVideoOutput *parent); QDeclarativeVideoWindowBackend(QDeclarativeVideoOutput *parent);
~QDeclarativeVideoWindowBackend(); ~QDeclarativeVideoWindowBackend();
bool init(QMediaService *service); bool init(QMediaService *service) Q_DECL_OVERRIDE;
void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData); void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
void releaseSource(); void releaseSource() Q_DECL_OVERRIDE;
void releaseControl(); void releaseControl() Q_DECL_OVERRIDE;
QSize nativeSize() const; QSize nativeSize() const Q_DECL_OVERRIDE;
void updateGeometry(); void updateGeometry() Q_DECL_OVERRIDE;
QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data); QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
QAbstractVideoSurface *videoSurface() const; QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
QRectF adjustedViewport() const Q_DECL_OVERRIDE; QRectF adjustedViewport() const Q_DECL_OVERRIDE;
private: private: