summaryrefslogtreecommitdiffstats
path: root/src/multimediawidgets/qpaintervideosurface.cpp
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-11 15:10:11 +0300
committerYoann Lopes <yoann.lopes@qt.io>2016-12-12 15:29:53 +0000
commit32e35a8839085d88ddbf289ba2669c6745e9a04a (patch)
tree8a009ea34d44114ee4cfabf275cdf95fb9bf159a /src/multimediawidgets/qpaintervideosurface.cpp
parentc89e2ea249015142f59c8ea440b6e36bac6f96c9 (diff)
Add missing override and remove redundant virtual
Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface.cpp')
-rw-r--r--src/multimediawidgets/qpaintervideosurface.cpp40
1 files changed, 20 insertions, 20 deletions
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<QVideoFrame::PixelFormat> 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<QVideoFrame::PixelFormat> m_imagePixelFormats;
@@ -252,19 +252,19 @@ public:
QVideoSurfaceGLPainter(QGLContext *context);
~QVideoSurfaceGLPainter();
QList<QVideoFrame::PixelFormat> 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;