summaryrefslogtreecommitdiffstats
path: root/examples/widgets/graphicsview/boxes/glbuffers.h
diff options
context:
space:
mode:
Diffstat (limited to 'examples/widgets/graphicsview/boxes/glbuffers.h')
-rw-r--r--examples/widgets/graphicsview/boxes/glbuffers.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/graphicsview/boxes/glbuffers.h b/examples/widgets/graphicsview/boxes/glbuffers.h
index 25ab66fca6..0c2ff43c7e 100644
--- a/examples/widgets/graphicsview/boxes/glbuffers.h
+++ b/examples/widgets/graphicsview/boxes/glbuffers.h
@@ -110,8 +110,8 @@ public:
GLTexture2D(int width, int height);
explicit GLTexture2D(const QString& fileName, int width = 0, int height = 0);
void load(int width, int height, QRgb *data);
- virtual void bind() Q_DECL_OVERRIDE;
- virtual void unbind() Q_DECL_OVERRIDE;
+ virtual void bind() override;
+ virtual void unbind() override;
};
class GLTexture3D : public GLTexture
@@ -121,8 +121,8 @@ public:
// TODO: Implement function below
//GLTexture3D(const QString& fileName, int width = 0, int height = 0);
void load(int width, int height, int depth, QRgb *data);
- virtual void bind() Q_DECL_OVERRIDE;
- virtual void unbind() Q_DECL_OVERRIDE;
+ virtual void bind() override;
+ virtual void unbind() override;
};
class GLTextureCube : public GLTexture
@@ -131,8 +131,8 @@ public:
GLTextureCube(int size);
explicit GLTextureCube(const QStringList& fileNames, int size = 0);
void load(int size, int face, QRgb *data);
- virtual void bind() Q_DECL_OVERRIDE;
- virtual void unbind() Q_DECL_OVERRIDE;
+ virtual void bind() override;
+ virtual void unbind() override;
};
// TODO: Define and implement class below
@@ -146,7 +146,7 @@ public:
void begin(int face);
// end rendering
void end();
- virtual bool failed() const Q_DECL_OVERRIDE {return m_failed || m_fbo.failed();}
+ virtual bool failed() const override {return m_failed || m_fbo.failed();}
static void getViewMatrix(QMatrix4x4& mat, int face);
static void getProjectionMatrix(QMatrix4x4& mat, float nearZ, float farZ);