X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_graphicview.h;h=2a5c3a8d1848c465ec22fa7d17be423e697295dc;hb=f7188d32d0beaef31fc3475be05daea2f018ebec;hp=b509421ec406b24d31300d342995b24084f61183;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/widgets/qg_graphicview.h b/src/widgets/qg_graphicview.h
index b509421..2a5c3a8 100644
--- a/src/widgets/qg_graphicview.h
+++ b/src/widgets/qg_graphicview.h
@@ -2,13 +2,14 @@
 #define QG_GRAPHICVIEW_H
 
 #include <QtGui>
-#include "rs_graphicview.h"
+#include "graphicview.h"
 #include "rs_layerlistlistener.h"
 #include "rs_blocklistlistener.h"
 #include "qg_scrollbar.h"
 
-class RS_Preview;
+class RS_Document;
 class PaintInterface;
+class RS_Preview;
 
 /**
  * This is the Qt implementation of a widget which can view a
@@ -17,13 +18,15 @@ class PaintInterface;
  * Instances of this class can be linked to layer lists using
  * addLayerListListener().
  */
-class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePreview,
+//class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePreview,
+class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview,
 	public RS_LayerListListener, public RS_BlockListListener
 {
 	Q_OBJECT
 
 	public:
 		QG_GraphicView(QWidget * parent = 0, const char * name = 0, Qt::WindowFlags f = 0);
+		QG_GraphicView(RS_Document * doc, QWidget * parent = 0);
 		virtual ~QG_GraphicView();
 
 		virtual int getWidth();
@@ -31,12 +34,6 @@ class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePrev
 		virtual void redraw();
 		virtual void adjustOffsetControls();
 		virtual void adjustZoomControls();
-//		virtual RS_Painter * createPainter();
-//		virtual RS_Painter * createDirectPainter();
-#warning "!!! Need to scrub out all instances of createPainter and createDirectPainter !!!"
-		virtual PaintInterface * createPainter();
-		virtual PaintInterface * createDirectPainter();
-		virtual void destroyPainter();
 		virtual void setBackground(const RS_Color & bg);
 		virtual void setMouseCursor(RS2::CursorType c);
 		virtual void updateGridStatusWidget(const QString & text);
@@ -66,6 +63,9 @@ class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePrev
 #warning "!!! File preview needs porting to Qt4 !!!"
 //		void previewUrl(const Q3Url &u);
 
+	private:
+		void CommonInitialization(void);
+
 	private slots:
 		void slotHScrolled(int value);
 		void slotVScrolled(int value);