X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fleader.h;h=9f14cf06f487fcef6ee2366ba57eb0bdd241ffe9;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=521093eacd11138a274677fcfb747362cc2b9e28;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/leader.h b/src/base/leader.h
index 521093e..9f14cf0 100644
--- a/src/base/leader.h
+++ b/src/base/leader.h
@@ -7,16 +7,16 @@
 /**
  * Holds the data that defines a leader.
  */
-class RS_LeaderData
+class LeaderData
 {
 	public:
-		RS_LeaderData() {}
-		RS_LeaderData(bool arrowHeadFlag)
+		LeaderData() {}
+		LeaderData(bool arrowHeadFlag)
 		{
 			arrowHead = arrowHeadFlag;
 		}
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_LeaderData & /*ld*/)
+		friend std::ostream & operator<<(std::ostream & os, const LeaderData & /*ld*/)
 		{
 			os << "(Leader)";
 			return os;
@@ -31,20 +31,20 @@ class RS_LeaderData
  *
  * @author Andrew Mustun
  */
-class RS_Leader: public RS_EntityContainer
+class Leader: public EntityContainer
 {
 	public:
-		RS_Leader(RS_EntityContainer * parent = NULL);
-		RS_Leader(RS_EntityContainer * parent, const RS_LeaderData & d);
-		virtual ~RS_Leader();
+		Leader(EntityContainer * parent = NULL);
+		Leader(EntityContainer * parent, const LeaderData & d);
+		virtual ~Leader();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
 		virtual void update();
-		RS_LeaderData getData() const;
+		LeaderData getData() const;
 		bool hasArrowHead();
-		virtual RS_Entity * addVertex(const Vector & v);
-		virtual void addEntity(RS_Entity * entity);
+		virtual Entity * addVertex(const Vector & v);
+		virtual void addEntity(Entity * entity);
 		virtual double getLength();
 		virtual void move(Vector offset);
 		virtual void rotate(Vector center, double angle);
@@ -52,10 +52,10 @@ class RS_Leader: public RS_EntityContainer
 		virtual void mirror(Vector axisPoint1, Vector axisPoint2);
 		virtual void stretch(Vector firstCorner, Vector secondCorner, Vector offset);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Leader & l);
+		friend std::ostream & operator<<(std::ostream & os, const Leader & l);
 
 	protected:
-		RS_LeaderData data;
+		LeaderData data;
 		bool empty;
 };