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

diff --git a/src/base/spline.h b/src/base/spline.h
index dd6470b..3ea3fb9 100644
--- a/src/base/spline.h
+++ b/src/base/spline.h
@@ -7,21 +7,21 @@
 /**
  * Holds the data that defines a line.
  */
-class RS_SplineData
+class SplineData
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_SplineData() {}
+		SplineData() {}
 
-		RS_SplineData(int degree, bool closed)
+		SplineData(int degree, bool closed)
 		{
 			this->degree = degree;
 			this->closed = closed;
 		}
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_SplineData & ld)
+		friend std::ostream & operator<<(std::ostream & os, const SplineData & ld)
 		{
 			os << "( degree: " << ld.degree << " closed: " << ld.closed << ")";
 			return os;
@@ -42,16 +42,16 @@ class RS_SplineData
  *
  * @author Andrew Mustun
  */
-class RS_Spline: public RS_EntityContainer
+class Spline: public EntityContainer
 {
 public:
-    RS_Spline(RS_EntityContainer * parent, const RS_SplineData & d);
-    virtual ~RS_Spline();
+    Spline(EntityContainer * parent, const SplineData & d);
+    virtual ~Spline();
 
-    virtual RS_Entity * clone();
+    virtual Entity * clone();
     virtual RS2::EntityType rtti() const;
     virtual bool isEdge() const;
-    RS_SplineData getData() const;
+    SplineData getData() const;
 	void setDegree(int deg);
 	int getDegree();
     int getNumberOfKnots();
@@ -76,7 +76,7 @@ public:
     virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 	QList<Vector> getControlPoints();
 
-    friend std::ostream & operator<<(std::ostream & os, const RS_Spline & l);
+    friend std::ostream & operator<<(std::ostream & os, const Spline & l);
 
     virtual void calculateBorders();
 
@@ -87,7 +87,7 @@ public:
 	static void rbsplinu(int npts, int k, int p1, double b[], double h[], double p[]);
 
 protected:
-    RS_SplineData data;
+    SplineData data;
 };
 
 #endif