From 32e35a8839085d88ddbf289ba2669c6745e9a04a Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Sun, 11 Dec 2016 15:10:11 +0300 Subject: Add missing override and remove redundant virtual Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes --- src/multimediawidgets/qcameraviewfinder.h | 4 +- src/multimediawidgets/qgraphicsvideoitem.h | 12 ++--- src/multimediawidgets/qpaintervideosurface.cpp | 40 ++++++++-------- src/multimediawidgets/qpaintervideosurface_p.h | 10 ++-- src/multimediawidgets/qvideowidget.h | 20 ++++---- src/multimediawidgets/qvideowidget_p.h | 66 +++++++++++++------------- 6 files changed, 76 insertions(+), 76 deletions(-) (limited to 'src/multimediawidgets') diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 2bd49fe83..57f20809a 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -64,10 +64,10 @@ public: explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR); ~QCameraViewfinder(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; protected: - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; private: Q_DISABLE_COPY(QCameraViewfinder) diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 89de3397a..204993e7f 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -66,7 +66,7 @@ public: explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR); ~QGraphicsVideoItem(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; Qt::AspectRatioMode aspectRatioMode() const; void setAspectRatioMode(Qt::AspectRatioMode mode); @@ -79,18 +79,18 @@ public: QSizeF nativeSize() const; - QRectF boundingRect() const; + QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); protected: - void timerEvent(QTimerEvent *event); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + void timerEvent(QTimerEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; QGraphicsVideoItemPrivate *d_ptr; diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 9a6ad11ed..214e5ec7e 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -72,19 +72,19 @@ public: QVideoSurfaceGenericPainter(); QList supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType) const; + QAbstractVideoBuffer::HandleType handleType) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; - QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); + QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame) override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; - void updateColors(int brightness, int contrast, int hue, int saturation); + void updateColors(int brightness, int contrast, int hue, int saturation) override; private: QList m_imagePixelFormats; @@ -252,19 +252,19 @@ public: QVideoSurfaceGLPainter(QGLContext *context); ~QVideoSurfaceGLPainter(); QList supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType) const; + QAbstractVideoBuffer::HandleType handleType) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - void stop(); + void stop() override; - QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); + QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame) override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; - void updateColors(int brightness, int contrast, int hue, int saturation); - void viewportDestroyed(); + void updateColors(int brightness, int contrast, int hue, int saturation) override; + void viewportDestroyed() override; protected: void initRgbTextureInfo(GLenum internalFormat, GLuint format, GLenum type, const QSize &size); @@ -667,11 +667,11 @@ class QVideoSurfaceArbFpPainter : public QVideoSurfaceGLPainter public: QVideoSurfaceArbFpPainter(QGLContext *context); - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; private: typedef void (APIENTRY *_glProgramStringARB) (GLenum, GLenum, GLsizei, const GLvoid *); @@ -1066,11 +1066,11 @@ class QVideoSurfaceGlslPainter : public QVideoSurfaceGLPainter public: QVideoSurfaceGlslPainter(QGLContext *context); - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; private: QGLShaderProgram m_program; diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h index 2e89393e9..bf0a0ac5c 100644 --- a/src/multimediawidgets/qpaintervideosurface_p.h +++ b/src/multimediawidgets/qpaintervideosurface_p.h @@ -99,14 +99,14 @@ public: ~QPainterVideoSurface(); QList supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const; + QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - bool start(const QVideoSurfaceFormat &format); - void stop(); + bool start(const QVideoSurfaceFormat &format) override; + void stop() override; - bool present(const QVideoFrame &frame); + bool present(const QVideoFrame &frame) override; int brightness() const; void setBrightness(int brightness); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 9aca9d3a4..c8474288b 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -67,7 +67,7 @@ public: explicit QVideoWidget(QWidget *parent = Q_NULLPTR); ~QVideoWidget(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; #ifdef Q_QDOC bool isFullScreen() const; @@ -80,7 +80,7 @@ public: int hue() const; int saturation() const; - QSize sizeHint() const; + QSize sizeHint() const override; public Q_SLOTS: void setFullScreen(bool fullScreen); @@ -98,14 +98,14 @@ Q_SIGNALS: void saturationChanged(int saturation); protected: - bool event(QEvent *event); - void showEvent(QShowEvent *event); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); - - bool setMediaObject(QMediaObject *object); + bool event(QEvent *event) override; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; + + bool setMediaObject(QMediaObject *object) override; #if defined(Q_WS_WIN) bool winEvent(MSG *message, long *result); diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index 15aaa5a60..6ef4c3645 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -106,15 +106,15 @@ public: void releaseControl(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; private: QMediaService *m_service; @@ -134,23 +134,23 @@ public: void releaseControl(); void clearSurface(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - QSize sizeHint() const; + QSize sizeHint() const override; - void showEvent(); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); + void showEvent() override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; Q_SIGNALS: void fullScreenChanged(bool fullScreen); @@ -188,23 +188,23 @@ public: void releaseControl(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - QSize sizeHint() const; + QSize sizeHint() const override; - void showEvent(); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); + void showEvent() override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; #if defined(Q_WS_WIN) bool winEvent(MSG *message, long *result); -- cgit v1.2.3