Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawarc3p.cpp

diff --git a/src/actions/actiondrawarc3p.cpp b/src/actions/actiondrawarc3p.cpp
index ce3d6587850cbad5b59cf92d0c0a24e8fb7673b0..77ed90f16def627cc7306b0915142a4d555863c5 100644 (file)
--- a/src/actions/actiondrawarc3p.cpp
+++ b/src/actions/actiondrawarc3p.cpp
@@ -23,7 +23,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawArc3P::ActionDrawArc3P(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDrawArc3P::ActionDrawArc3P(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Draw arcs 3P", container, graphicView)
 {
        reset();
@@ -55,7 +55,7 @@ void ActionDrawArc3P::trigger()
 
        if (data.isValid())
        {
-               RS_Arc * arc = new RS_Arc(container, data);
+               Arc * arc = new Arc(container, data);
                arc->setLayerToActive();
                arc->setPenToActive();
                container->addEntity(arc);
@@ -78,7 +78,7 @@ void ActionDrawArc3P::trigger()
                reset();
        }
        else
-               RS_DIALOGFACTORY->commandMessage(tr("Invalid arc data."));
+               DIALOGFACTORY->commandMessage(tr("Invalid arc data."));
 }
 
 void ActionDrawArc3P::preparePreview()
@@ -87,7 +87,7 @@ void ActionDrawArc3P::preparePreview()
 
        if (point1.valid && point2.valid && point3.valid)
        {
-               RS_Arc arc(NULL, data);
+               Arc arc(NULL, data);
                bool suc = arc.createFrom3P(point1, point2, point3);
 
                if (suc)
@@ -110,7 +110,7 @@ void ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 
                if (point1.valid)
                {
-//                     RS_Line * line = new RS_Line(preview, RS_LineData(point1, point2));
+//                     Line * line = new Line(preview, LineData(point1, point2));
 //
 //                     deletePreview();
 //                     clearPreview();
@@ -125,7 +125,7 @@ void ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 
                if (data.isValid())
                {
-//                     RS_Arc * arc = new RS_Arc(preview, data);
+//                     Arc * arc = new Arc(preview, data);
 //
 //                     deletePreview();
 //                     clearPreview();
@@ -185,18 +185,18 @@ void ActionDrawArc3P::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawArc3P::commandEvent(RS_CommandEvent * e)
+void ActionDrawArc3P::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
 
-       if (RS_COMMANDS->checkCommand("center", c, rtti()))
+       if (COMMANDS->checkCommand("center", c, rtti()))
        {
                finish();
                graphicView->setCurrentAction(new ActionDrawArc(*container, *graphicView));
@@ -214,19 +214,19 @@ void ActionDrawArc3P::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetPoint1:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify startpoint or [Center]"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify startpoint or [Center]"), 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 endpoint"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify endpoint"), tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -239,8 +239,8 @@ void ActionDrawArc3P::updateMouseCursor()
 void ActionDrawArc3P::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarArcs);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarArcs);
 }