Commit aaea12bb authored by Jan Möbius's avatar Jan Möbius

Dennis: Make glViewer independent of QtGLGraphicsScene/View

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6657 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b6aa4298
......@@ -42,8 +42,6 @@
//== INCLUDES =================================================================
#include "QtBaseViewer.hh"
#include "QtGLGraphicsScene.hh"
#include "QtGLGraphicsView.hh"
#include "QtGLViewerLayout.hh"
#include <ACG/QtWidgets/QtWheel.hh>
#include <ACG/Scenegraph/DrawModes.hh>
......@@ -85,6 +83,8 @@
#include <QButtonGroup>
#include <QToolBar>
#include <QGraphicsView>
#include <QGraphicsScene>
#include <QGraphicsWidget>
#include <QGraphicsGridLayout>
#include <QGraphicsProxyWidget>
......@@ -118,7 +118,7 @@ static const char VIEW_MAGIC[] =
//== IMPLEMENTATION ==========================================================
glViewer::glViewer( QtGLGraphicsScene* _scene,
glViewer::glViewer( QGraphicsScene* _scene,
QGLWidget* _glWidget,
Viewer::ViewerProperties& _properties,
QGraphicsWidget* _parent) :
......
......@@ -93,8 +93,7 @@ namespace ACG {
class QtWheel;
}
}
class QtGLGraphicsScene;
class QtGLGraphicsView;
class QGraphicsScene;
class QtGLViewerLayout;
class QtShiftPopupMenu;
......@@ -125,7 +124,7 @@ public:
if \c statusBar==0 then a \a private status bar will be created
\param _format OpenGL context settings, will be passed to glarea()
*/
glViewer( QtGLGraphicsScene* _scene,
glViewer( QGraphicsScene* _scene,
QGLWidget* _glWidget,
Viewer::ViewerProperties& _properties,
QGraphicsWidget* _parent=0);
......@@ -519,7 +518,7 @@ private:
bool blending_;
// graphics scene used to paint gl context and widgets
QtGLGraphicsScene* glScene_;
QGraphicsScene* glScene_;
// gl widget used as drawing area to paint the graphics scene
QGLWidget* glWidget_;
......
Markdown is supported
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