Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / point.h

diff --git a/src/base/point.h b/src/base/point.h
index 20fb95e5b41830c19e1027cb9d19ef81d6d0ebe6..4e467d09b556446fbe8c5e867b7234f13ad51c8a 100644 (file)
--- a/src/base/point.h
+++ b/src/base/point.h
@@ -6,15 +6,15 @@
 /**
  * Holds the data that defines a point.
  */
-class RS_PointData
+class PointData
 {
        public:
-               RS_PointData(const Vector & pos)
+               PointData(const Vector & pos)
                {
                        this->pos = pos;
                }
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_PointData & pd)
+               friend std::ostream & operator<<(std::ostream & os, const PointData & pd)
                {
                        os << "(" << pd.pos << ")";
                        return os;
@@ -28,28 +28,28 @@ class RS_PointData
  *
  * @author Andrew Mustun
  */
-class RS_Point: public RS_AtomicEntity
+class Point: public AtomicEntity
 {
        public:
-               RS_Point(RS_EntityContainer * parent, const RS_PointData & d);
+               Point(EntityContainer * parent, const PointData & d);
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
                virtual Vector getStartpoint() const;
                virtual Vector getEndpoint() const;
                virtual void moveStartpoint(const Vector & pos);
-               RS_PointData getData() const;
+               PointData getData() const;
                virtual VectorSolutions getRefPoints();
                Vector getPos();
                void setPos(const Vector & pos);
 
                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);
+                               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 double getDistanceToPoint(const Vector& coord, RS_Entity ** entity = NULL,
+               virtual double getDistanceToPoint(const Vector& coord, Entity ** entity = NULL,
                        RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
 
                virtual void move(Vector offset);
@@ -58,13 +58,13 @@ class RS_Point: public RS_AtomicEntity
                virtual void mirror(Vector axisPoint1, Vector axisPoint2);
                virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_Point & p);
+               friend std::ostream & operator<<(std::ostream & os, const Point & p);
 
                /** Recalculates the borders of this entity. */
                virtual void calculateBorders();
 
        protected:
-               RS_PointData data;
+               PointData data;
                //Vector point;
 };