Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawcircle2p.cpp

diff --git a/src/actions/actiondrawcircle2p.cpp b/src/actions/actiondrawcircle2p.cpp
index 33d55340c09a830ef5046d3c33b034e8a7e55a08..d580bb33f7e30aca5369e0c894b9f4aa8810fea4 100644 (file)
--- a/src/actions/actiondrawcircle2p.cpp
+++ b/src/actions/actiondrawcircle2p.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawCircle2P::ActionDrawCircle2P(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles",
+ActionDrawCircle2P::ActionDrawCircle2P(EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles",
                container, graphicView)
 {
        reset();
@@ -53,7 +53,7 @@ void ActionDrawCircle2P::trigger()
 
        if (data.isValid())
        {
-               RS_Circle * circle = new RS_Circle(container, data);
+               Circle * circle = new Circle(container, data);
                circle->setLayerToActive();
                circle->setPenToActive();
                container->addEntity(circle);
@@ -76,8 +76,8 @@ void ActionDrawCircle2P::trigger()
                setStatus(SetPoint1);
                reset();
        }
-       else    if (RS_DIALOGFACTORY != NULL)
-               RS_DIALOGFACTORY->requestWarningDialog(tr("Invalid Circle data."));
+       else    if (DIALOGFACTORY != NULL)
+               DIALOGFACTORY->requestWarningDialog(tr("Invalid Circle data."));
 }
 
 void ActionDrawCircle2P::preparePreview()
@@ -86,7 +86,7 @@ void ActionDrawCircle2P::preparePreview()
 
        if (point1.valid && point2.valid)
        {
-               RS_Circle circle(NULL, data);
+               Circle circle(NULL, data);
                bool suc = circle.createFrom2P(point1, point2);
 
                if (suc)
@@ -110,7 +110,7 @@ void ActionDrawCircle2P::mouseMoveEvent(QMouseEvent * e)
 
                if (data.isValid())
                {
-//                     RS_Circle * circle = new RS_Circle(preview, data);
+//                     Circle * circle = new Circle(preview, data);
 //                     deletePreview();
 //                     clearPreview();
 //                     preview->addEntity(circle);
@@ -164,14 +164,14 @@ void ActionDrawCircle2P::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawCircle2P::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle2P::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               if (DIALOGFACTORY != NULL)
+                       DIALOGFACTORY->commandMessage(msgAvailableCommands()
                                + getAvailableCommands().join(", "));
                return;
        }
@@ -185,22 +185,22 @@ QStringList ActionDrawCircle2P::getAvailableCommands()
 
 void ActionDrawCircle2P::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetPoint1:
-                       RS_DIALOGFACTORY->updateMouseWidget(
+                       DIALOGFACTORY->updateMouseWidget(
                                tr("Specify first point"), tr("Cancel"));
                        break;
 
                case SetPoint2:
-                       RS_DIALOGFACTORY->updateMouseWidget(
+                       DIALOGFACTORY->updateMouseWidget(
                                tr("Specify second point"), tr("Back"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -213,11 +213,11 @@ void ActionDrawCircle2P::updateMouseCursor()
 
 void ActionDrawCircle2P::updateToolBar()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
        }
 }