X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_grid.cpp;h=b12f7c81ca31bbb7c334c7c844a5b724a7221e73;hb=bd2b29c8735d83ab48df13c3efee53f63570473e;hp=61368edc9f25228fa1b7aa006aabe74b1e9ba175;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/base/rs_grid.cpp b/src/base/rs_grid.cpp
index 61368ed..b12f7c8 100644
--- a/src/base/rs_grid.cpp
+++ b/src/base/rs_grid.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,10 +16,15 @@
 
 #include "rs_grid.h"
 
-#include "rs_units.h"
-#include "rs_graphic.h"
+#include "drawing.h"
+#include "graphicview.h"
+//#include "rs_graphicview.h"
 #include "settings.h"
+#include "rs_units.h"
+#include "vector.h"
 
+#warning "!!! Clean out all references to RS_GraphicView here and in header !!!"
+#if 0
 /**
  * Constructor.
  */
@@ -25,6 +32,15 @@ RS_Grid::RS_Grid(RS_GraphicView * gv): graphicView(gv), pt(NULL), number(0),
 	metaX(NULL), numMetaX(0), metaY(NULL), numMetaY(0)
 {
 }
+#endif
+
+/**
+ * Constructor II.
+ */
+RS_Grid::RS_Grid(GraphicView * gv): graphicView(gv), pt(NULL), number(0),
+	metaX(NULL), numMetaX(0), metaY(NULL), numMetaY(0)
+{
+}
 
 /**
  * Destructor.
@@ -51,7 +67,7 @@ void RS_Grid::update()
 	if (!graphicView->isGridOn())
 		return;
 
-	RS_Graphic * graphic = graphicView->getGraphic();
+	Drawing * graphic = graphicView->getGraphic();
 
 	// auto scale grid?
 	settings.beginGroup("Appearance");