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

diff --git a/src/base/block.h b/src/base/block.h
index ceed443..c016d0e 100644
--- a/src/base/block.h
+++ b/src/base/block.h
@@ -7,12 +7,12 @@
 /**
  * Holds the data that defines a block.
  */
-class RS_BlockData
+class BlockData
 {
 	public:
-		RS_BlockData() {}
+		BlockData() {}
 
-		RS_BlockData(const QString & name1, const Vector & basePoint1, bool frozen1):
+		BlockData(const QString & name1, const Vector & basePoint1, bool frozen1):
 			name(name1), basePoint(basePoint1), frozen(frozen1) {}
 
 		bool isValid()
@@ -40,32 +40,32 @@ class RS_BlockData
  * block. Note that although technically possible, a block should
  * never be part of the entity tree of a graphic. Blocks are
  * stored in a seperate list inside the graphic document (a block list).
- * The graphic can contain RS_Insert entities that refer to such
+ * The graphic can contain Insert entities that refer to such
  * blocks.
  *
  * blocks are documents and can therefore be handled by graphic views.
  *
  * @author Andrew Mustun
  */
-class RS_Block: public RS_Document
+class Block: public Document
 {
-		friend class RS_BlockList;
+		friend class BlockList;
 
 	public:
-		RS_Block(RS_EntityContainer * parent, const RS_BlockData & d);
-		virtual ~RS_Block();
+		Block(EntityContainer * parent, const BlockData & d);
+		virtual ~Block();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
 		QString getName() const;
 		Vector getBasePoint() const;
-		virtual RS_LayerList * getLayerList();
-		virtual RS_BlockList * getBlockList();
+		virtual LayerList * getLayerList();
+		virtual BlockList * getBlockList();
 		virtual void newDoc();
 		virtual bool save();
 		virtual bool saveAs(const QString & filename, RS2::FormatType type);
 		virtual bool open(const QString &, RS2::FormatType);
-		friend std::ostream & operator<<(std::ostream & os, const RS_Block & b);
+		friend std::ostream & operator<<(std::ostream & os, const Block & b);
 		void setName(const QString & n);
 		bool isFrozen() const;
 		void toggle();
@@ -83,7 +83,7 @@ class RS_Block: public RS_Document
 		*/
 		//QString name;
 		//! Block data
-		RS_BlockData data;
+		BlockData data;
 };
 
 #endif