Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawcircle3p.cpp

diff --git a/src/actions/actiondrawcircle3p.cpp b/src/actions/actiondrawcircle3p.cpp
index c836878032af34d5565c7297f10fe5d2c85e3b7e..eacd6d89b02b8fdbdd9a0dc33f4b380fbc6727f3 100644 (file)
--- a/src/actions/actiondrawcircle3p.cpp
+++ b/src/actions/actiondrawcircle3p.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawCircle3P::ActionDrawCircle3P(RS_EntityContainer & container,
+ActionDrawCircle3P::ActionDrawCircle3P(EntityContainer & container,
        GraphicView & graphicView): ActionInterface("Draw circles",
        container, graphicView)
 {
@@ -55,7 +55,7 @@ void ActionDrawCircle3P::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);
@@ -79,7 +79,7 @@ void ActionDrawCircle3P::trigger()
                reset();
        }
        else
-               RS_DIALOGFACTORY->requestWarningDialog(tr("Invalid circle data."));
+               DIALOGFACTORY->requestWarningDialog(tr("Invalid circle data."));
 }
 
 void ActionDrawCircle3P::preparePreview()
@@ -88,7 +88,7 @@ void ActionDrawCircle3P::preparePreview()
 
        if (point1.valid && point2.valid && point3.valid)
        {
-               RS_Circle circle(NULL, data);
+               Circle circle(NULL, data);
                bool success = circle.createFrom3P(point1, point2, point3);
 
                if (success)
@@ -116,7 +116,7 @@ void ActionDrawCircle3P::mouseMoveEvent(QMouseEvent * e)
 
                if (data.isValid())
                {
-//                     RS_Circle * circle = new RS_Circle(preview, data);
+//                     Circle * circle = new Circle(preview, data);
 //
 //                     deletePreview();
 //                     clearPreview();
@@ -173,13 +173,13 @@ void ActionDrawCircle3P::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawCircle3P::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle3P::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -196,19 +196,19 @@ void ActionDrawCircle3P::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetPoint1:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
                break;
 
        case SetPoint2:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
                break;
 
        case SetPoint3:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify third point"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify third point"), tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -221,7 +221,7 @@ void ActionDrawCircle3P::updateMouseCursor()
 void ActionDrawCircle3P::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 }