Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / leader.cpp

diff --git a/src/base/leader.cpp b/src/base/leader.cpp
index 945e3df95b476f7049b5d0c572e969e377dfe114..995a21b9477dcd96c59d3f42bfc9b0ba36e89944 100644 (file)
--- a/src/base/leader.cpp
+++ b/src/base/leader.cpp
@@ -23,7 +23,7 @@
 /**
  * Constructor.
  */
-RS_Leader::RS_Leader(RS_EntityContainer * parent): RS_EntityContainer(parent)
+Leader::Leader(EntityContainer * parent): EntityContainer(parent)
 {
     empty = true;
 }
@@ -32,8 +32,8 @@ RS_Leader::RS_Leader(RS_EntityContainer * parent): RS_EntityContainer(parent)
  * Constructor.
  * @param d Leader data
  */
-RS_Leader::RS_Leader(RS_EntityContainer * parent, const RS_LeaderData & d):
-       RS_EntityContainer(parent), data(d)
+Leader::Leader(EntityContainer * parent, const LeaderData & d):
+       EntityContainer(parent), data(d)
 {
     empty = true;
 }
@@ -41,13 +41,13 @@ RS_Leader::RS_Leader(RS_EntityContainer * parent, const RS_LeaderData & d):
 /**
  * Destructor
  */
-RS_Leader::~RS_Leader()
+Leader::~Leader()
 {
 }
 
-/*virtual*/ RS_Entity * RS_Leader::clone()
+/*virtual*/ Entity * Leader::clone()
 {
-       RS_Leader * p = new RS_Leader(*this);
+       Leader * p = new Leader(*this);
 #warning "!!! Need to deal with setAutoDelete() Qt3->Qt4 !!!"
 //     p->entities.setAutoDelete(entities.autoDelete());
        p->initId();
@@ -56,7 +56,7 @@ RS_Leader::~RS_Leader()
 }
 
 /**    @return RS2::EntityDimLeader */
-/*virtual*/ RS2::EntityType RS_Leader::rtti() const
+/*virtual*/ RS2::EntityType Leader::rtti() const
 {
        return RS2::EntityDimLeader;
 }
@@ -64,10 +64,10 @@ RS_Leader::~RS_Leader()
 /**
  * Implementation of update. Updates the arrow.
  */
-void RS_Leader::update()
+void Leader::update()
 {
        // find and delete arrow:
-       for(RS_Entity * e=firstEntity(); e!=NULL; e=nextEntity())
+       for(Entity * e=firstEntity(); e!=NULL; e=nextEntity())
        {
                if (e->rtti() == RS2::EntitySolid)
                {
@@ -82,33 +82,33 @@ void RS_Leader::update()
                return;
        }
 
-       RS_Entity * fe = firstEntity();
+       Entity * fe = firstEntity();
 
        if (fe != NULL && fe->isAtomic())
        {
-               Vector p1 = ((RS_AtomicEntity *)fe)->getStartpoint();
-               Vector p2 = ((RS_AtomicEntity *)fe)->getEndpoint();
+               Vector p1 = ((AtomicEntity *)fe)->getStartpoint();
+               Vector p2 = ((AtomicEntity *)fe)->getEndpoint();
 
                // first entity must be the line which gets the arrow:
                if (hasArrowHead())
                {
-                       RS_Solid * s = new RS_Solid(this, RS_SolidData());
+                       Solid * s = new Solid(this, SolidData());
                        s->shapeArrow(p1, p2.angleTo(p1), getGraphicVariableDouble("$DIMASZ", 2.5));
-                       s->setPen(RS_Pen(RS2::FlagInvalid));
+                       s->setPen(Pen(RS2::FlagInvalid));
                        s->setLayer(NULL);
-                       RS_EntityContainer::addEntity(s);
+                       EntityContainer::addEntity(s);
                }
        }
 }
 
 /** @return Copy of data that defines the leader. */
-RS_LeaderData RS_Leader::getData() const
+LeaderData Leader::getData() const
 {
        return data;
 }
 
 /** @return true: if this leader has an arrow at the beginning. */
-bool RS_Leader::hasArrowHead()
+bool Leader::hasArrowHead()
 {
        return data.arrowHead;
 }
@@ -124,9 +124,9 @@ bool RS_Leader::hasArrowHead()
  * @return Pointer to the entity that was addded or NULL if this
  *         was the first vertex added.
  */
-RS_Entity * RS_Leader::addVertex(const Vector & v)
+Entity * Leader::addVertex(const Vector & v)
 {
-       RS_Entity * entity = NULL;
+       Entity * entity = NULL;
        static Vector last = Vector(false);
 
        if (empty)
@@ -137,10 +137,10 @@ RS_Entity * RS_Leader::addVertex(const Vector & v)
        else
        {
                // add line to the leader:
-               entity = new RS_Line(this, RS_LineData(last, v));
-               entity->setPen(RS_Pen(RS2::FlagInvalid));
+               entity = new Line(this, LineData(last, v));
+               entity->setPen(Pen(RS2::FlagInvalid));
                entity->setLayer(NULL);
-               RS_EntityContainer::addEntity(entity);
+               EntityContainer::addEntity(entity);
 
                if (count() == 1 && hasArrowHead())
                        update();
@@ -157,9 +157,9 @@ RS_Entity * RS_Leader::addVertex(const Vector & v)
  *
  * To add entities use addVertex() instead.
  */
-void RS_Leader::addEntity(RS_Entity * entity)
+void Leader::addEntity(Entity * entity)
 {
-       RS_DEBUG->print(RS_Debug::D_WARNING, "RS_Leader::addEntity: should never be called");
+       DEBUG->print(Debug::D_WARNING, "Leader::addEntity: should never be called");
 
        if (entity == NULL)
                return;
@@ -167,48 +167,48 @@ void RS_Leader::addEntity(RS_Entity * entity)
        delete entity;
 }
 
-/*virtual*/ double RS_Leader::getLength()
+/*virtual*/ double Leader::getLength()
 {
        return -1.0;
 }
 
-void RS_Leader::move(Vector offset)
+void Leader::move(Vector offset)
 {
-       RS_EntityContainer::move(offset);
+       EntityContainer::move(offset);
        update();
 }
 
-void RS_Leader::rotate(Vector center, double angle)
+void Leader::rotate(Vector center, double angle)
 {
-       RS_EntityContainer::rotate(center, angle);
+       EntityContainer::rotate(center, angle);
        update();
 }
 
-void RS_Leader::scale(Vector center, Vector factor)
+void Leader::scale(Vector center, Vector factor)
 {
-       RS_EntityContainer::scale(center, factor);
+       EntityContainer::scale(center, factor);
        update();
 }
 
-void RS_Leader::mirror(Vector axisPoint1, Vector axisPoint2)
+void Leader::mirror(Vector axisPoint1, Vector axisPoint2)
 {
-       RS_EntityContainer::mirror(axisPoint1, axisPoint2);
+       EntityContainer::mirror(axisPoint1, axisPoint2);
        update();
 }
 
-void RS_Leader::stretch(Vector firstCorner, Vector secondCorner, Vector offset)
+void Leader::stretch(Vector firstCorner, Vector secondCorner, Vector offset)
 {
-       RS_EntityContainer::stretch(firstCorner, secondCorner, offset);
+       EntityContainer::stretch(firstCorner, secondCorner, offset);
        update();
 }
 
 /**
  * Dumps the leader's data to stdout.
  */
-std::ostream & operator<<(std::ostream & os, const RS_Leader & l)
+std::ostream & operator<<(std::ostream & os, const Leader & l)
 {
        os << " Leader: " << l.getData() << " {\n";
-       os << (RS_EntityContainer &)l;
+       os << (EntityContainer &)l;
        os << "\n}\n";
 
        return os;