summaryrefslogtreecommitdiffstats
path: root/examples/opengl/textures/glwidget.h
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/textures/glwidget.h')
-rw-r--r--examples/opengl/textures/glwidget.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/opengl/textures/glwidget.h b/examples/opengl/textures/glwidget.h
index 4b7c3e4..f793d6d 100644
--- a/examples/opengl/textures/glwidget.h
+++ b/examples/opengl/textures/glwidget.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the examples of the Qt Toolkit.
@@ -21,9 +20,10 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
@@ -44,6 +44,8 @@
#include <QGLWidget>
+class CubeObject;
+
class GLWidget : public QGLWidget
{
Q_OBJECT
@@ -69,16 +71,14 @@ protected:
void mouseReleaseEvent(QMouseEvent *event);
private:
- GLuint makeObject();
+ void makeObject();
QColor clearColor;
QPoint lastPos;
int xRot;
int yRot;
int zRot;
-
- static GLuint sharedObject;
- static int refCount;
+ CubeObject *cube;
};
#endif