Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawcirclecr.cpp

diff --git a/src/actions/actiondrawcirclecr.cpp b/src/actions/actiondrawcirclecr.cpp
index 4f41d81c0a252cdf70f143a1684fee86c09013a3..dfd1150790067a17b02a030df4999069639fc70b 100644 (file)
--- a/src/actions/actiondrawcirclecr.cpp
+++ b/src/actions/actiondrawcirclecr.cpp
@@ -25,7 +25,7 @@
 /**
  * Constructor.
  */
-ActionDrawCircleCR::ActionDrawCircleCR(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles CR",
+ActionDrawCircleCR::ActionDrawCircleCR(EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles CR",
                container, graphicView)
 {
        reset();
@@ -42,7 +42,7 @@ ActionDrawCircleCR::~ActionDrawCircleCR()
 
 void ActionDrawCircleCR::reset()
 {
-       data = RS_CircleData(Vector(false), 0.0);
+       data = CircleData(Vector(false), 0.0);
 }
 
 void ActionDrawCircleCR::init(int status)
@@ -54,7 +54,7 @@ void ActionDrawCircleCR::trigger()
 {
        ActionInterface::trigger();
 
-       RS_Circle * circle = new RS_Circle(container, data);
+       Circle * circle = new Circle(container, data);
        circle->setLayerToActive();
        circle->setPenToActive();
        container->addEntity(circle);
@@ -76,12 +76,12 @@ void ActionDrawCircleCR::trigger()
 
        setStatus(SetCenter);
 
-       RS_DEBUG->print("ActionDrawCircleCR::trigger(): circle added: %d", circle->getId());
+       DEBUG->print("ActionDrawCircleCR::trigger(): circle added: %d", circle->getId());
 }
 
 void ActionDrawCircleCR::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawCircleCR::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawCircleCR::mouseMoveEvent begin");
        Vector mouse = snapPoint(e);
 
        switch (getStatus())
@@ -90,12 +90,12 @@ void ActionDrawCircleCR::mouseMoveEvent(QMouseEvent * e)
                data.center = mouse;
                deletePreview();
                clearPreview();
-//             preview->addEntity(new RS_Circle(preview, data));
+//             preview->addEntity(new Circle(preview, data));
                drawPreview();
                break;
        }
 
-       RS_DEBUG->print("ActionDrawCircleCR::mouseMoveEvent end");
+       DEBUG->print("ActionDrawCircleCR::mouseMoveEvent end");
 }
 
 void ActionDrawCircleCR::mouseReleaseEvent(QMouseEvent * e)
@@ -132,13 +132,13 @@ void ActionDrawCircleCR::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawCircleCR::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircleCR::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -159,14 +159,14 @@ void ActionDrawCircleCR::commandEvent(RS_CommandEvent * e)
        case SetRadius:
        {
                bool ok;
-               double r = RS_Math::eval(c, &ok);
+               double r = Math::eval(c, &ok);
 
                if (ok == true)
                        data.radius = r;
                else
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
-               RS_DIALOGFACTORY->requestOptions(this, true, true);
+               DIALOGFACTORY->requestOptions(this, true, true);
                setStatus(SetCenter);
        }
        break;
@@ -198,15 +198,15 @@ void ActionDrawCircleCR::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetCenter:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify circle center"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify circle center"), tr("Cancel"));
                break;
 
        case SetRadius:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify circle radius"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify circle radius"), tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -215,14 +215,14 @@ void ActionDrawCircleCR::showOptions()
 {
        ActionInterface::showOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, true);
+       DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionDrawCircleCR::hideOptions()
 {
        ActionInterface::hideOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, false);
+       DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDrawCircleCR::updateMouseCursor()
@@ -233,9 +233,9 @@ void ActionDrawCircleCR::updateMouseCursor()
 void ActionDrawCircleCR::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 }
 
 double ActionDrawCircleCR::getRadius()