git-svn-id: svn://db.shs.com.ru/libs@536 a8b55f48-bf90-11e4-a774-851b48703e85

qglview/glvbo.h

@@ -22,10 +22,7 @@
 #include "gltypes.h"
 #include "chunkstream.h"
 
-class GLVBO
-#if QT_VERSION >= 0x050600
-			: protected QOpenGLExtraFunctions
-#endif
+class GLVBO : protected QOpenGLExtraFunctions
 {
 	friend class GLObjectBase;
 	friend QDataStream & operator <<(QDataStream & s, const GLVBO & m);
@@ -39,7 +36,7 @@ public:
 	void init();
 	void destroy();
 	bool rebuffer(bool clear_ = false);
-	void draw(GLenum type, __GLShaderProgram__ * prog, bool simplest = false);
+	void draw(GLenum type, QOpenGLShaderProgram * prog, bool simplest = false);
 	void clear();
 
 	GLuint buffer() const {return buffer_;}
@@ -58,7 +55,7 @@ public:
 	bool saveToFile(const QString & filename);
 	bool loadFromFile(const QString & filename);
 
-	Box3D boundingBox(const QMatrix4x4 & mat = QMatrix4x4()) const;
+	Box3D boundingBox() const;
 
 private:
 	void calculateBinormals();