Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / arc.h

diff --git a/src/base/arc.h b/src/base/arc.h
index 1db003a4ebfc2c3d030e5f275add24a453dd0570..2c785c68556a5e5ed938f707f5dbce97853dd5fb 100644 (file)
--- a/src/base/arc.h
+++ b/src/base/arc.h
@@ -9,14 +9,14 @@ class GraphicView;
 /**
  * Holds the data that defines an arc.
  */
-class RS_ArcData
+class ArcData
 {
        public:
-               RS_ArcData()
+               ArcData()
                {
                }
 
-               RS_ArcData(const Vector & center, double radius, double angle1, double angle2, bool reversed)
+               ArcData(const Vector & center, double radius, double angle1, double angle2, bool reversed)
                {
                        this->center = center;
                        this->radius = radius;
@@ -40,7 +40,7 @@ class RS_ArcData
                                && fabs(angle1 - angle2) > RS_TOLERANCE_ANGLE);
                }
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_ArcData & ad)
+               friend std::ostream & operator<<(std::ostream & os, const ArcData & ad)
                {
                        os << "(" << ad.center
                        << "/" << ad.radius
@@ -63,18 +63,18 @@ class RS_ArcData
  *
  * @author Andrew Mustun
  */
-class RS_Arc: public RS_AtomicEntity
+class Arc: public AtomicEntity
 {
        public:
-               RS_Arc(RS_EntityContainer * parent, const RS_ArcData & d);
-               virtual ~RS_Arc();
+               Arc(EntityContainer * parent, const ArcData & d);
+               virtual ~Arc();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
                virtual bool isEdge() const;
-               RS_ArcData getData() const;
+               ArcData getData() const;
                virtual VectorSolutions getRefPoints();
-               void setData(RS_ArcData d);
+               void setData(ArcData d);
                Vector getCenter() const;
                void setCenter(const Vector & c);
                double getRadius() const;
@@ -105,13 +105,13 @@ class RS_Arc: public RS_AtomicEntity
                bool createFrom2PBulge(const Vector & startPoint, const Vector & endPoint, double bulge);
 
                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);
+               virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true, 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);
                virtual void scale(Vector center, Vector factor);
@@ -121,13 +121,13 @@ class RS_Arc: public RS_AtomicEntity
 
                virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_Arc & a);
+               friend std::ostream & operator<<(std::ostream & os, const Arc & a);
 
                virtual void calculateEndpoints();
                virtual void calculateBorders();
 
        protected:
-               RS_ArcData data;
+               ArcData data;
 
                /**
                 * Startpoint. This is redundant but stored for performance