X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdrawing.h;fp=src%2Fbase%2Fdrawing.h;h=3163070798c9216f211a9b9d6721becad9a9fdce;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=1190f71038eaf2de2fdbb4f7869236bb9c5fcdaf;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/drawing.h b/src/base/drawing.h
index 1190f71..3163070 100644
--- a/src/base/drawing.h
+++ b/src/base/drawing.h
@@ -16,16 +16,16 @@
  *
  * @author Andrew Mustun
  */
-class Drawing: public RS_Document
+class Drawing: public Document
 {
 	public:
-		Drawing(RS_EntityContainer * parent = NULL);
+		Drawing(EntityContainer * parent = NULL);
 		virtual ~Drawing();
 
 		virtual RS2::EntityType rtti() const;
-		virtual unsigned long int countLayerEntities(RS_Layer * layer);
-		virtual RS_LayerList * getLayerList();
-		virtual RS_BlockList * getBlockList();
+		virtual unsigned long int countLayerEntities(Layer * layer);
+		virtual LayerList * getLayerList();
+		virtual BlockList * getBlockList();
 		virtual void newDoc();
 		virtual bool save();
 		virtual bool saveAs(const QString& filename, RS2::FormatType type);
@@ -34,38 +34,38 @@ class Drawing: public RS_Document
 		// Wrappers for Layer functions:
 		void clearLayers();
 		uint countLayers() const;
-		RS_Layer * layerAt(uint i);
+		Layer * layerAt(uint i);
 		void activateLayer(const QString & name);
-		void activateLayer(RS_Layer * layer);
-		RS_Layer * getActiveLayer();
-		virtual void addLayer(RS_Layer * layer);
-		virtual void removeLayer(RS_Layer * layer);
-		virtual void editLayer(RS_Layer * layer, const RS_Layer & source);
-		RS_Layer * findLayer(const QString & name);
+		void activateLayer(Layer * layer);
+		Layer * getActiveLayer();
+		virtual void addLayer(Layer * layer);
+		virtual void removeLayer(Layer * layer);
+		virtual void editLayer(Layer * layer, const Layer & source);
+		Layer * findLayer(const QString & name);
 		void toggleLayer(const QString & name);
-		void toggleLayer(RS_Layer * layer);
-		void toggleLayerLock(RS_Layer * layer);
+		void toggleLayer(Layer * layer);
+		void toggleLayerLock(Layer * layer);
 		void freezeAllLayers(bool freeze);
-//	    void addLayerListListener(RS_LayerListListener * listener);
-//	    void removeLayerListListener(RS_LayerListListener * listener);
+//	    void addLayerListListener(LayerListListener * listener);
+//	    void removeLayerListListener(LayerListListener * listener);
 
 		// Wrapper for block functions:
 		void clearBlocks();
 		uint countBlocks();
-		RS_Block * blockAt(uint i);
+		Block * blockAt(uint i);
 		void activateBlock(const QString & name);
-		void activateBlock(RS_Block * block);
-		RS_Block * getActiveBlock();
-		virtual bool addBlock(RS_Block * block, bool notify = true);
+		void activateBlock(Block * block);
+		Block * getActiveBlock();
+		virtual bool addBlock(Block * block, bool notify = true);
 		virtual void addBlockNotification();
-		virtual void removeBlock(RS_Block * block);
-		RS_Block * findBlock(const QString & name);
+		virtual void removeBlock(Block * block);
+		Block * findBlock(const QString & name);
 		QString newBlockName();
 		void toggleBlock(const QString & name);
-		void toggleBlock(RS_Block * block);
+		void toggleBlock(Block * block);
 		void freezeAllBlocks(bool freeze);
-//	    void addBlockListListener(RS_BlockListListener * listener);
-//	    void removeBlockListListener(RS_BlockListListener * listener);
+//	    void addBlockListListener(BlockListListener * listener);
+//	    void removeBlockListListener(BlockListListener * listener);
 
 		// Wrappers for variable functions:
 		void clearVariables();
@@ -79,8 +79,8 @@ class Drawing: public RS_Document
 		int getVariableInt(const QString & key, int def);
 		double getVariableDouble(const QString & key, double def);
 		void removeVariable(const QString & key);
-	//	Q3Dict<RS_Variable> & getVariableDict();
-		QMultiHash<QString, RS_Variable *> & getVariableDict();
+	//	Q3Dict<Variable> & getVariableDict();
+		QMultiHash<QString, Variable *> & getVariableDict();
 
 		RS2::LinearFormat getLinearFormat();
 		int getLinearPrecision();
@@ -112,9 +112,9 @@ class Drawing: public RS_Document
 		friend std::ostream & operator<<(std::ostream & os, Drawing & g);
 
 	private:
-		RS_LayerList layerList;
-		RS_BlockList blockList;
-		RS_VariableDict variableDict;
+		LayerList layerList;
+		BlockList blockList;
+		VariableDict variableDict;
 #ifdef RS_CAM
 		RS_CamData camData;
 #endif