refactored RenderPolicy initialization and OpenGL resource allocation. greatly simplifies initialization code.

1 files changed, 8 insertions, 14 deletions

diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index 11524140c9..d7ac39abd8 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -17,9 +17,6 @@ namespace qt
 {
   class QScaleSlider;
 
-  /// Replace this to set a draw widget kernel.
-  typedef GLDrawWidget widget_type;
-
   class DrawWidget;
 
   class QtVideoTimer : public ::VideoTimer
@@ -40,22 +37,15 @@ namespace qt
     void stop();
   };
 
-  class DrawWidget : public widget_type
+  class DrawWidget : public QGLWidget
   {
-    typedef widget_type base_type;
-
-    shared_ptr<WindowHandle> m_handle;
+    typedef model::FeaturesFetcher model_t;
 
-    shared_ptr<drawer_t> m_drawer;
     bool m_isInitialized;
     bool m_isTimerStarted;
 
-    typedef model::FeaturesFetcher model_t;
-
     scoped_ptr<Framework<model_t> > m_framework;
 
-    shared_ptr<VideoTimer> m_videoTimer;
-
     bool m_isDrag;
     bool m_isRotate;
 
@@ -105,14 +95,18 @@ namespace qt
     Framework<model_t> & GetFramework() { return *m_framework.get(); }
 
   protected:
+
+    VideoTimer * CreateVideoTimer();
+
     static const uint32_t ini_file_version = 0;
 
   protected:
+
     /// @name Overriden from base_type.
     //@{
     virtual void initializeGL();
-    virtual void DoDraw(shared_ptr<screen_t> p);
-    virtual void DoResize(int w, int h);
+    virtual void resizeGL(int w, int h);
+    virtual void paintGL();
     //@}
 
     void DrawFrame();