Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / constructionline.h

diff --git a/src/base/constructionline.h b/src/base/constructionline.h
index e51a693ef0b3866691d240f7a55489122a2a2a64..e470c23c365107d2dbf469bf5404f2b201d7d091 100644 (file)
--- a/src/base/constructionline.h
+++ b/src/base/constructionline.h
@@ -8,23 +8,23 @@
  * Holds the data that defines a construction line (a line
  * which is not limited to both directions).
  */
-class RS_ConstructionLineData
+class ConstructionLineData
 {
        public:
                /**
                 * Default constructor. Leaves the data object uninitialized.
                 */
-               RS_ConstructionLineData() {}
+               ConstructionLineData() {}
 
-               RS_ConstructionLineData(const Vector & point1, const Vector & point2)
+               ConstructionLineData(const Vector & point1, const Vector & point2)
                {
                        this->point1 = point1;
                        this->point2 = point2;
                }
 
-               friend class RS_ConstructionLine;
+               friend class ConstructionLine;
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_ConstructionLineData & ld)
+               friend std::ostream & operator<<(std::ostream & os, const ConstructionLineData & ld)
                {
                        os << "(" << ld.point1 <<
                        "/" << ld.point2 <<
@@ -42,27 +42,27 @@ class RS_ConstructionLineData
  *
  * @author Andrew Mustun
  */
-class RS_ConstructionLine: public RS_AtomicEntity
+class ConstructionLine: public AtomicEntity
 {
        public:
-               RS_ConstructionLine(RS_EntityContainer * parent, const RS_ConstructionLineData & d);
-               virtual ~RS_ConstructionLine();
+               ConstructionLine(EntityContainer * parent, const ConstructionLineData & d);
+               virtual ~ConstructionLine();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
                virtual Vector getStartpoint() const;
                virtual Vector getEndpoint() const;
-               RS_ConstructionLineData getData() const;
+               ConstructionLineData getData() const;
                Vector getPoint1() const;
                Vector getPoint2() const;
                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);
                virtual void rotate(Vector center, double angle);
@@ -71,11 +71,11 @@ class RS_ConstructionLine: public RS_AtomicEntity
                virtual void draw(PaintInterface * /*painter*/, GraphicView * /*view*/,
                        double /*patternOffset*/);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_ConstructionLine & l);
+               friend std::ostream & operator<<(std::ostream & os, const ConstructionLine & l);
                virtual void calculateBorders();
 
        protected:
-               RS_ConstructionLineData data;
+               ConstructionLineData data;
 };
 
 #endif