Commit 844be7c4 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed wrong return in ACG Shadernode (bool instead of 0 pointer)

Fixed wrong signature of size hint function



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14471 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 862c96fe
...@@ -238,10 +238,10 @@ glViewer::~glViewer() ...@@ -238,10 +238,10 @@ glViewer::~glViewer()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QSize QSizeF
glViewer::sizeHint() const glViewer::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{ {
return QSize( 600, 600 ); return QSizeF( 600, 600 );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -152,7 +152,6 @@ public: ...@@ -152,7 +152,6 @@ public:
//------------------------------------------------------------- public methods //------------------------------------------------------------- public methods
virtual QSize sizeHint () const;
/// Makes this widget the current widget for OpenGL operations. /// Makes this widget the current widget for OpenGL operations.
virtual void makeCurrent(); virtual void makeCurrent();
...@@ -422,6 +421,10 @@ protected: ...@@ -422,6 +421,10 @@ protected:
friend class SimpleGLGraphicsScene; friend class SimpleGLGraphicsScene;
friend class QtGLGraphicsView; friend class QtGLGraphicsView;
/// Return a resonable size hint
virtual QSizeF sizeHint (Qt::SizeHint which, const QSizeF & constraint) const;
/// initialize OpenGL states /// initialize OpenGL states
virtual void initializeGL(); virtual void initializeGL();
/// draw the scene. Triggered by updateGL(). /// draw the scene. Triggered by updateGL().
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment