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

diff --git a/src/base/polyline.h b/src/base/polyline.h
index 49c9b09..b6fba86 100644
--- a/src/base/polyline.h
+++ b/src/base/polyline.h
@@ -7,26 +7,26 @@
 /**
  * Holds the data that defines a polyline.
  */
-class RS_PolylineData: public RS_Flags
+class PolylineData: public Flags
 {
 	public:
-		RS_PolylineData()
+		PolylineData()
 		{
 			startpoint = endpoint = Vector(false);
 		}
 
-		RS_PolylineData(const Vector & startpoint, const Vector & endpoint, bool closed)
+		PolylineData(const Vector & startpoint, const Vector & endpoint, bool closed)
 		{
 			this->startpoint = startpoint;
 			this->endpoint = endpoint;
 
-			if (closed == true)
+			if (closed)
 				setFlag(RS2::FlagClosed);
 		}
 
-		friend class RS_Polyline;
+		friend class Polyline;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_PolylineData & pd)
+		friend std::ostream & operator<<(std::ostream & os, const PolylineData & pd)
 		{
 			os << "(" << pd.startpoint << "/" << pd.endpoint << ")";
 			return os;
@@ -42,16 +42,16 @@ class RS_PolylineData: public RS_Flags
  *
  * @author Andrew Mustun
  */
-class RS_Polyline: public RS_EntityContainer
+class Polyline: public EntityContainer
 {
 	public:
-		RS_Polyline(RS_EntityContainer * parent = NULL);
-		RS_Polyline(RS_EntityContainer * parent, const RS_PolylineData & d);
-		virtual ~RS_Polyline();
+		Polyline(EntityContainer * parent = NULL);
+		Polyline(EntityContainer * parent, const PolylineData & d);
+		virtual ~Polyline();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
-		RS_PolylineData getData() const;
+		PolylineData getData() const;
 		void setStartpoint(Vector & v);
 		Vector getStartpoint();
 		void setEndpoint(Vector & v);
@@ -64,10 +64,10 @@ class RS_Polyline: public RS_EntityContainer
 		virtual VectorSolutions getRefPoints();
 		virtual Vector getNearestRef(const Vector & coord, double * dist = NULL);
 		virtual Vector getNearestSelectedRef(const Vector & coord, double * dist = NULL);
-		virtual RS_Entity * addVertex(const Vector & v, double bulge = 0.0, bool prepend = false);
+		virtual Entity * addVertex(const Vector & v, double bulge = 0.0, bool prepend = false);
 		virtual void setNextBulge(double bulge);
-		virtual void addEntity(RS_Entity * entity);
-		//virtual void addSegment(RS_Entity* entity);
+		virtual void addEntity(Entity * entity);
+		//virtual void addSegment(Entity* entity);
 		virtual void removeLastVertex();
 		virtual void endPolyline();
 		//virtual void reorder();
@@ -79,14 +79,14 @@ class RS_Polyline: public RS_EntityContainer
 		virtual void stretch(Vector firstCorner, Vector secondCorner, Vector offset);
 		virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Polyline & l);
+		friend std::ostream & operator<<(std::ostream & os, const Polyline & l);
 
 	protected:
-		virtual RS_Entity * createVertex(const Vector & v, double bulge = 0.0, bool prepend = false);
+		virtual Entity * createVertex(const Vector & v, double bulge = 0.0, bool prepend = false);
 
 	protected:
-		RS_PolylineData data;
-		RS_Entity * closingEntity;
+		PolylineData data;
+		Entity * closingEntity;
 		double nextBulge;
 };