Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawcircle.cpp

diff --git a/src/actions/actiondrawcircle.cpp b/src/actions/actiondrawcircle.cpp
index 84e0640d627c7d7a4d1fa76d7edeb55ed74c5f5c..7c19be06412e87f7781e5eea632c0b239fafd763 100644 (file)
--- a/src/actions/actiondrawcircle.cpp
+++ b/src/actions/actiondrawcircle.cpp
@@ -22,7 +22,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawCircle::ActionDrawCircle(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDrawCircle::ActionDrawCircle(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Draw circles", container, graphicView)
 {
        reset();
@@ -39,7 +39,7 @@ ActionDrawCircle::~ActionDrawCircle()
 
 void ActionDrawCircle::reset()
 {
-       data = RS_CircleData(Vector(false), 0.0);
+       data = CircleData(Vector(false), 0.0);
 }
 
 void ActionDrawCircle::init(int status)
@@ -53,7 +53,7 @@ void ActionDrawCircle::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 ActionDrawCircle::trigger()
        setStatus(SetCenter);
        reset();
 
-       RS_DEBUG->print("ActionDrawCircle::trigger(): circle added: %d", circle->getId());
+       DEBUG->print("ActionDrawCircle::trigger(): circle added: %d", circle->getId());
 }
 
 void ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawCircle::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawCircle::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -98,13 +98,13 @@ void ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
                        data.radius = data.center.distanceTo(mouse);
                        deletePreview();
                        clearPreview();
-//                     preview->addEntity(new RS_Circle(preview, data));
+//                     preview->addEntity(new Circle(preview, data));
                        drawPreview();
                }
                break;
        }
 
-       RS_DEBUG->print("ActionDrawCircle::mouseMoveEvent end");
+       DEBUG->print("ActionDrawCircle::mouseMoveEvent end");
 }
 
 void ActionDrawCircle::mouseReleaseEvent(QMouseEvent * e)
@@ -153,14 +153,14 @@ void ActionDrawCircle::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawCircle::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               if (DIALOGFACTORY)
+                       DIALOGFACTORY->commandMessage(msgAvailableCommands()
                                + getAvailableCommands().join(", "));
                return;
        }
@@ -170,12 +170,12 @@ void ActionDrawCircle::commandEvent(RS_CommandEvent * e)
        case SetRadius:
        {
                bool ok;
-               double r = RS_Math::eval(c, &ok);
+               double r = Math::eval(c, &ok);
 
                if (ok)
                        data.radius = r;
-               else if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+               else if (DIALOGFACTORY)
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
                trigger();
                //setStatus(SetCenter);
@@ -198,18 +198,18 @@ void ActionDrawCircle::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetCenter:
-               if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify center"), tr("Cancel"));
+               if (DIALOGFACTORY)
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify center"), tr("Cancel"));
                break;
 
        case SetRadius:
-               if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify radius"), tr("Back"));
+               if (DIALOGFACTORY)
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify radius"), tr("Back"));
                break;
 
        default:
-               if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+               if (DIALOGFACTORY)
+                       DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -233,10 +233,10 @@ void ActionDrawCircle::updateToolBar()
 {
        if (!isFinished())
        {
-               if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               if (DIALOGFACTORY)
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        }
-       else if (RS_DIALOGFACTORY)
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
+       else if (DIALOGFACTORY)
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 
 }