diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-12 11:58:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-21 11:10:13 +0000 |
| commit | a5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch) | |
| tree | 61a093917f9c8308d2153335d49c58acc3836981 /src/core/stream_video_node.h | |
| parent | d08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff) | |
Standardize override declaration
Update our overrides to Qt coding standard getting rid of
Q_DECL_OVERRIDE and redundant virtual declarations.
Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/stream_video_node.h')
| -rw-r--r-- | src/core/stream_video_node.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/stream_video_node.h b/src/core/stream_video_node.h index 46a433835..9d937791f 100644 --- a/src/core/stream_video_node.h +++ b/src/core/stream_video_node.h @@ -57,13 +57,13 @@ class StreamVideoMaterial : public QSGMaterial public: StreamVideoMaterial(QSGTexture *texture, TextureTarget target); - virtual QSGMaterialType *type() const Q_DECL_OVERRIDE + QSGMaterialType *type() const override { static QSGMaterialType theType; return &theType; } - virtual QSGMaterialShader *createShader() const; + QSGMaterialShader *createShader() const override; QSGTexture *m_texture; QMatrix4x4 m_texMatrix; |