1 files changed, 7 insertions, 18 deletions
diff --git a/qt_tstfrm/tstwidgets.hpp b/qt_tstfrm/tstwidgets.hpp
index a55e0680e3..0f05ccf074 100644
--- a/qt_tstfrm/tstwidgets.hpp
+++ b/qt_tstfrm/tstwidgets.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "widgets.hpp"
-
 #include "../graphics/opengl/texture.hpp"
 #include "../graphics/opengl/renderbuffer.hpp"
 
@@ -12,43 +10,34 @@
 
 #include "../std/shared_ptr.hpp"
 
+#include <QtOpenGL/QGLWidget>
 
 namespace graphics
 {
-  class Skin;
   namespace gl
   {
     class Screen;
   }
 }
 
-namespace qt { class Screen; }
-
 namespace tst
 {
-  class GLDrawWidget : public qt::GLDrawWidgetT<graphics::Screen>
+  class GLDrawWidget : public QGLWidget
   {
-  protected:
-    typedef qt::GLDrawWidgetT<graphics::Screen> base_type;
+  public:
 
     shared_ptr<graphics::ResourceManager> m_resourceManager;
 
     shared_ptr<graphics::gl::FrameBuffer> m_primaryFrameBuffer;
-    shared_ptr<graphics::gl::FrameBuffer> m_frameBuffer;
-    shared_ptr<graphics::gl::RGBA8Texture> m_renderTarget;
-    shared_ptr<graphics::gl::RenderBuffer> m_depthBuffer;
-    shared_ptr<graphics::Skin> m_skin;
     shared_ptr<qt::gl::RenderContext> m_primaryContext;
     shared_ptr<graphics::Screen> m_primaryScreen;
 
-  public:
-
-    GLDrawWidget();
-    virtual ~GLDrawWidget();
-
-  protected:
     virtual void initializeGL();
     virtual void resizeGL(int w, int h);
     virtual void paintGL();
+
+  public:
+
+    virtual void DoDraw(shared_ptr<graphics::Screen> const & screen) = 0;
   };
 }