X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fgraphicview.h;h=6e2ec159156379b4b7a8ff0afb81335eb5c98036;hb=d774c2655ba2c3657a565f325411144452392277;hp=94e5be2c50fa4f20a736bedf7e13834ee93fbf87;hpb=c715d05d11ffe2913fe3465ec43d456ee9b85964;p=architektonas

diff --git a/src/mainapp/graphicview.h b/src/mainapp/graphicview.h
index 94e5be2..6e2ec15 100644
--- a/src/mainapp/graphicview.h
+++ b/src/mainapp/graphicview.h
@@ -8,18 +8,16 @@
 #include "rs_snapper.h"
 #include "vector.h"
 
+class ActionInterface;
+class RS_CommandEvent;
 class Drawing;
 class PaintInterface;
-class RS_EntityContainer;
-class RS_ActionInterface;
 class RS_Entity;
-class RS_LineTypePattern;
-class RS_CommandEvent;
-class Vector;
-class RS_Preview;
+class RS_EntityContainer;
+class RS_EventHandler;
 class RS_Grid;
+class RS_LineTypePattern;
 class RS_Pen;
-class RS_EventHandler;
 
 class GraphicView
 {
@@ -87,10 +85,10 @@ class GraphicView
 		void freezeZoom(bool freeze);
 		bool isZoomFrozen();
 
-		void setDefaultAction(RS_ActionInterface * action);
-		RS_ActionInterface *  getDefaultAction();
-		void setCurrentAction(RS_ActionInterface * action);
-		RS_ActionInterface * getCurrentAction();
+		void setDefaultAction(ActionInterface * action);
+		ActionInterface *  getDefaultAction();
+		void setCurrentAction(ActionInterface * action);
+		ActionInterface * getCurrentAction();
 
 		void killSelectActions();
 		void killAllActions();
@@ -196,14 +194,6 @@ class GraphicView
 		void setSimulationRapid(bool r);
 		bool getSimulationRapid();
 
-		//this is here because of crappy braindead infrastructure
-		void SetPreviewMode(bool mode = true);
-		void SetPreviewEntity(RS_Preview *);
-		void SetPreviewOffset(Vector);
-//We can remove this now...
-//		void SetSnapperDraw(bool);
-//		void SetSnapperVars(Vector snapSpot, Vector snapCoord, bool showCrosshairs);
-
 	protected:
 		RS_EntityContainer * container;
 		RS_EventHandler * eventHandler;
@@ -287,16 +277,6 @@ class GraphicView
 		RS_Snapper snapper;
 		RS_Preview preview;
 
-	protected:
-		// crap to make painting with update() possible
-		RS_Preview * previewEntity;
-		bool previewMode;
-		Vector previewOffset;
-//		bool snapperDraw;
-//		Vector snapSpot1;
-//		Vector snapCoord1;
-//		bool showCrosshairs1;
-
 //QG
 	protected:
 		int lastWidth;
@@ -305,8 +285,6 @@ class GraphicView
 		QScrollBar * hScrollBar;
 		//! Vertical scrollbar.
 		QScrollBar * vScrollBar;
-//		//! Layout used to fit in the view and the scrollbars.
-//		QGridLayout * layout;
 		//! Label for grid spacing.
 		QLabel * gridStatus;
 		//! CAD mouse cursor
@@ -320,7 +298,7 @@ class GraphicView
 		//! Hand mouse cursor
 		QCursor * curHand;
 
-//QC
+//QC was merged with QG
 };
 
 #endif	// __GRAPHICVIEW_H__