Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / solid.h

diff --git a/src/base/solid.h b/src/base/solid.h
index a4b457895be161c77fcc83678995ce731cbec5d6..62de485e05c79ae5d8c0e8fe21a88acf3a8ff7d9 100644 (file)
--- a/src/base/solid.h
+++ b/src/base/solid.h
@@ -7,13 +7,13 @@
 /**
  * Holds the data that defines a solid.
  */
-class RS_SolidData
+class SolidData
 {
        public:
                /**
                 * Default constructor. Leaves the data object uninitialized.
                 */
-               RS_SolidData()
+               SolidData()
                {
                        for(int i=0; i<4; ++i)
                                corner[i] = Vector(false);
@@ -22,7 +22,7 @@ class RS_SolidData
                /**
                 * Constructor for a solid with 3 corners.
                 */
-               RS_SolidData(const Vector & corner1, const Vector & corner2, const Vector & corner3)
+               SolidData(const Vector & corner1, const Vector & corner2, const Vector & corner3)
                {
                        corner[0] = corner1;
                        corner[1] = corner2;
@@ -33,7 +33,7 @@ class RS_SolidData
                /**
                 * Constructor for a solid with 4 corners.
                 */
-               RS_SolidData(const Vector & corner1, const Vector & corner2, const Vector & corner3, const Vector & corner4)
+               SolidData(const Vector & corner1, const Vector & corner2, const Vector & corner3, const Vector & corner4)
                {
                        corner[0] = corner1;
                        corner[1] = corner2;
@@ -41,9 +41,9 @@ class RS_SolidData
                        corner[3] = corner4;
                }
 
-               friend class RS_Solid;
+               friend class Solid;
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_SolidData & pd)
+               friend std::ostream & operator<<(std::ostream & os, const SolidData & pd)
                {
                        os << "(";
 
@@ -63,27 +63,27 @@ class RS_SolidData
  *
  * @author Andrew Mustun
  */
-class RS_Solid: public RS_AtomicEntity
+class Solid: public AtomicEntity
 {
        public:
-               RS_Solid(RS_EntityContainer * parent, const RS_SolidData & d);
+               Solid(EntityContainer * parent, const SolidData & d);
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
                virtual Vector getStartpoint() const;
                virtual Vector getEndpoint() const;
-               RS_SolidData getData() const;
+               SolidData getData() const;
                bool isTriangle();
                Vector getCorner(int num);
                void shapeArrow(const Vector & point, double angle, double arrowSize);
 
                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 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);
@@ -91,13 +91,13 @@ class RS_Solid: 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_Solid & p);
+               friend std::ostream & operator<<(std::ostream & os, const Solid & p);
 
                /** Recalculates the borders of this entity. */
                virtual void calculateBorders ();
 
        protected:
-               RS_SolidData data;
+               SolidData data;
 };
 
 #endif