Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawlineangle.cpp

diff --git a/src/actions/actiondrawlineangle.cpp b/src/actions/actiondrawlineangle.cpp
index 36441b72d6f2e9186e026f5ad6c60f253e91178b..aeff68adceb9969d1699c6f69060a271996a3cd5 100644 (file)
--- a/src/actions/actiondrawlineangle.cpp
+++ b/src/actions/actiondrawlineangle.cpp
@@ -23,7 +23,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawLineAngle::ActionDrawLineAngle(RS_EntityContainer & container,
+ActionDrawLineAngle::ActionDrawLineAngle(EntityContainer & container,
        GraphicView & graphicView, double a, bool fa):
        ActionInterface("Draw lines with given angle", container, graphicView),
        pos(Vector(false)), angle(a), length(1.0), fixedAngle(fa), snpPoint(0)
@@ -47,7 +47,7 @@ ActionDrawLineAngle::~ActionDrawLineAngle()
 
 void ActionDrawLineAngle::reset()
 {
-       data = RS_LineData(Vector(false), Vector(false));
+       data = LineData(Vector(false), Vector(false));
 }
 
 void ActionDrawLineAngle::init(int status)
@@ -60,7 +60,7 @@ void ActionDrawLineAngle::trigger()
 {
        ActionInterface::trigger();
        preparePreview();
-       RS_Line * line = new RS_Line(container, data);
+       Line * line = new Line(container, data);
        line->setLayerToActive();
        line->setPenToActive();
        container->addEntity(line);
@@ -78,12 +78,12 @@ void ActionDrawLineAngle::trigger()
        graphicView->drawEntity(line);
        graphicView->moveRelativeZero(data.startpoint);
        graphicView->redraw();
-       RS_DEBUG->print("ActionDrawLineAngle::trigger(): line added: %d", line->getId());
+       DEBUG->print("ActionDrawLineAngle::trigger(): line added: %d", line->getId());
 }
 
 void ActionDrawLineAngle::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawLineAngle::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawLineAngle::mouseMoveEvent begin");
 
        if (getStatus() == SetPos)
        {
@@ -91,15 +91,15 @@ void ActionDrawLineAngle::mouseMoveEvent(QMouseEvent * e)
 //             deletePreview();
 //             clearPreview();
 //             preparePreview();
-//             preview->addEntity(new RS_Line(preview, data));
+//             preview->addEntity(new Line(preview, data));
 //             drawPreview();
                preparePreview();
                graphicView->preview.clear();
-               graphicView->preview.addEntity(new RS_Line(&(graphicView->preview), data));
+               graphicView->preview.addEntity(new Line(&(graphicView->preview), data));
        }
 
        graphicView->redraw();
-       RS_DEBUG->print("ActionDrawLineAngle::mouseMoveEvent end");
+       DEBUG->print("ActionDrawLineAngle::mouseMoveEvent end");
 }
 
 void ActionDrawLineAngle::mouseReleaseEvent(QMouseEvent * e)
@@ -141,7 +141,7 @@ void ActionDrawLineAngle::preparePreview()
                p1 = pos;
 
        p2 += p1;
-       data = RS_LineData(p1, p2);
+       data = LineData(p1, p2);
 }
 
 void ActionDrawLineAngle::coordinateEvent(Vector * e)
@@ -161,13 +161,13 @@ void ActionDrawLineAngle::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawLineAngle::commandEvent(RS_CommandEvent * e)
+void ActionDrawLineAngle::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -194,14 +194,14 @@ void ActionDrawLineAngle::commandEvent(RS_CommandEvent * e)
        case SetAngle:
        {
                bool ok;
-               double a = RS_Math::eval(c, &ok);
+               double a = Math::eval(c, &ok);
 
                if (ok)
-                       angle = RS_Math::deg2rad(a);
+                       angle = Math::deg2rad(a);
                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(SetPos);
        }
                break;
@@ -209,14 +209,14 @@ void ActionDrawLineAngle::commandEvent(RS_CommandEvent * e)
        case SetLength:
        {
                bool ok;
-               double l = RS_Math::eval(c, &ok);
+               double l = Math::eval(c, &ok);
 
                if (ok)
                        length = l;
                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(SetPos);
        }
                break;
@@ -251,15 +251,15 @@ void ActionDrawLineAngle::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetPos:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify position"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify position"), tr("Cancel"));
                break;
 
        case SetAngle:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Enter angle:"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Enter angle:"), tr("Back"));
                break;
 
        case SetLength:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Enter length:"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Enter length:"), tr("Back"));
                break;
 
        default:
@@ -270,13 +270,13 @@ void ActionDrawLineAngle::updateMouseButtonHints()
 void ActionDrawLineAngle::showOptions()
 {
        ActionInterface::showOptions();
-       RS_DIALOGFACTORY->requestOptions(this, true);
+       DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionDrawLineAngle::hideOptions()
 {
        ActionInterface::hideOptions();
-       RS_DIALOGFACTORY->requestOptions(this, false);
+       DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDrawLineAngle::updateMouseCursor()
@@ -287,9 +287,9 @@ void ActionDrawLineAngle::updateMouseCursor()
 void ActionDrawLineAngle::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }
 
 void ActionDrawLineAngle::setSnapPoint(int sp)