Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / circle.h

diff --git a/src/base/circle.h b/src/base/circle.h
index 8edd3eae84f56e4f831a1cccad20204c04f13cb3..99cedd6ade902d956f5d9a2e762ea0cc3e8fa8dc 100644 (file)
--- a/src/base/circle.h
+++ b/src/base/circle.h
@@ -6,14 +6,14 @@
 /**
  * Holds the data that defines a circle.
  */
-class RS_CircleData
+class CircleData
 {
        public:
-               RS_CircleData()
+               CircleData()
                {
                }
 
-               RS_CircleData(const Vector & center, double radius)
+               CircleData(const Vector & center, double radius)
                {
                        this->center = center;
                        this->radius = radius;
@@ -30,9 +30,9 @@ class RS_CircleData
                        return (center.valid && radius > RS_TOLERANCE);
                }
 
-               friend class RS_Circle;
+               friend class Circle;
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_CircleData & ad)
+               friend std::ostream & operator<<(std::ostream & os, const CircleData & ad)
                {
                        os << "(" << ad.center << "/" << ad.radius << ")";
                        return os;
@@ -48,16 +48,16 @@ class RS_CircleData
  *
  * @author Andrew Mustun
  */
-class RS_Circle: public RS_AtomicEntity
+class Circle: public AtomicEntity
 {
        public:
-               RS_Circle(RS_EntityContainer * parent, const RS_CircleData & d);
-               virtual ~RS_Circle();
+               Circle(EntityContainer * parent, const CircleData & d);
+               virtual ~Circle();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
                virtual bool isEdge() const;
-               RS_CircleData getData();
+               CircleData getData();
                virtual VectorSolutions getRefPoints();
                virtual Vector getStartpoint() const;
                virtual Vector getEndpoint() const;
@@ -75,12 +75,12 @@ class RS_Circle: public RS_AtomicEntity
                bool createFrom3P(const Vector & p1, const Vector & p2, const Vector & p3);
                virtual Vector getNearestEndpoint(const Vector & coord, double * dist = NULL);
                virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true,
-                       double * dist = NULL, RS_Entity ** entity = NULL);
+                       double * dist = NULL, Entity ** entity = NULL);
                virtual Vector getNearestCenter(const Vector & coord, double * dist = NULL);
                virtual Vector getNearestMiddle(const Vector & coord, double * dist = NULL);
                virtual Vector getNearestDist(double distance, const Vector & coord, double * dist = NULL);
                virtual Vector getNearestDist(double distance, bool startp);
-               virtual double getDistanceToPoint(const Vector & coord, RS_Entity ** entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
+               virtual double getDistanceToPoint(const Vector & coord, Entity ** entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
 
                virtual void move(Vector offset);
                virtual void rotate(Vector center, double angle);
@@ -89,12 +89,12 @@ class RS_Circle: public RS_AtomicEntity
                virtual void moveRef(const Vector & ref, const Vector & offset);
                virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_Circle & a);
+               friend std::ostream & operator<<(std::ostream & os, const Circle & a);
 
                virtual void calculateBorders();
 
        protected:
-               RS_CircleData data;
+               CircleData data;
 };
 
 #endif