summaryrefslogtreecommitdiffstats
path: root/examples/opengl/cube/mainwidget.h
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-12-19 11:27:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-28 20:44:55 +0100
commit0136252cb2973824b7f97abad1d4c3a4d9301178 (patch)
tree2e03b3946253216d6ce3a010d4155c36f3e834b7 /examples/opengl/cube/mainwidget.h
parent4eac2c4728da85a5cdf91ec25170b3417f7deb68 (diff)
Polish code of some opengl examples
Change-Id: If24ae1845176fc525cf6a239a5079f4802f8df3f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'examples/opengl/cube/mainwidget.h')
-rw-r--r--examples/opengl/cube/mainwidget.h24
1 files changed, 10 insertions, 14 deletions
diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h
index bd30ea93a0..cebfb30999 100644
--- a/examples/opengl/cube/mainwidget.h
+++ b/examples/opengl/cube/mainwidget.h
@@ -41,30 +41,26 @@
#ifndef MAINWIDGET_H
#define MAINWIDGET_H
-#include <QtOpenGL/QGLWidget>
-#include <QtOpenGL/QGLFunctions>
+#include "geometryengine.h"
+#include <QGLWidget>
+#include <QGLFunctions>
#include <QMatrix4x4>
#include <QQuaternion>
#include <QVector2D>
+#include <QBasicTimer>
+#include <QGLShaderProgram>
-QT_BEGIN_NAMESPACE
-class QBasicTimer;
-class QGLShaderProgram;
-QT_END_NAMESPACE
class GeometryEngine;
class MainWidget : public QGLWidget, protected QGLFunctions
{
Q_OBJECT
+
public:
explicit MainWidget(QWidget *parent = 0);
- virtual ~MainWidget();
-
-signals:
-
-public slots:
+ ~MainWidget();
protected:
void mousePressEvent(QMouseEvent *e);
@@ -79,9 +75,9 @@ protected:
void initTextures();
private:
- QBasicTimer *timer;
- QGLShaderProgram *program;
- GeometryEngine *geometries;
+ QBasicTimer timer;
+ QGLShaderProgram program;
+ GeometryEngine geometries;
GLuint texture;