Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawlinehorvert.cpp

diff --git a/src/actions/actiondrawlinehorvert.cpp b/src/actions/actiondrawlinehorvert.cpp
index e8707a2be12aa1c6ce036a3380e7a6764e0e4c00..3d3f24bcbcc9fc0d81a511c7fd9a22cb4c30b2ed 100644 (file)
--- a/src/actions/actiondrawlinehorvert.cpp
+++ b/src/actions/actiondrawlinehorvert.cpp
@@ -21,11 +21,11 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawLineHorVert::ActionDrawLineHorVert(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw horizontal/vertical lines",
+ActionDrawLineHorVert::ActionDrawLineHorVert(EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw horizontal/vertical lines",
                container, graphicView)
 {
        reset();
-       RS_DEBUG->print("ActionDrawLineHorVert::constructor");
+       DEBUG->print("ActionDrawLineHorVert::constructor");
 }
 
 ActionDrawLineHorVert::~ActionDrawLineHorVert()
@@ -34,21 +34,21 @@ ActionDrawLineHorVert::~ActionDrawLineHorVert()
 
 void ActionDrawLineHorVert::reset()
 {
-       data = RS_LineData(Vector(false), Vector(false));
+       data = LineData(Vector(false), Vector(false));
 }
 
 void ActionDrawLineHorVert::init(int status)
 {
        ActionInterface::init(status);
        reset();
-       RS_DEBUG->print("ActionDrawLineHorVert::init");
+       DEBUG->print("ActionDrawLineHorVert::init");
 }
 
 void ActionDrawLineHorVert::trigger()
 {
        ActionInterface::trigger();
 
-       RS_Line * line = new RS_Line(container, data);
+       Line * line = new Line(container, data);
        line->setLayerToActive();
        line->setPenToActive();
        container->addEntity(line);
@@ -65,13 +65,13 @@ void ActionDrawLineHorVert::trigger()
        graphicView->moveRelativeZero(Vector(0.0, 0.0));
        graphicView->drawEntity(line);
        graphicView->moveRelativeZero(line->getMiddlepoint());
-       RS_DEBUG->print("ActionDrawLineHorVert::trigger():"
+       DEBUG->print("ActionDrawLineHorVert::trigger():"
                " line added: %d", line->getId());
 }
 
 void ActionDrawLineHorVert::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -87,12 +87,12 @@ void ActionDrawLineHorVert::mouseMoveEvent(QMouseEvent * e)
 
                deletePreview();
                clearPreview();
-               data = RS_LineData(p1, p2);
-//             preview->addEntity(new RS_Line(preview, data));
+               data = LineData(p1, p2);
+//             preview->addEntity(new Line(preview, data));
                drawPreview();
        }
 
-       RS_DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent end");
+       DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent end");
 }
 
 void ActionDrawLineHorVert::mouseReleaseEvent(QMouseEvent * e)
@@ -131,15 +131,15 @@ void ActionDrawLineHorVert::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetStartpoint:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
                break;
 
        case SetEndpoint:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -152,7 +152,7 @@ void ActionDrawLineHorVert::updateMouseCursor()
 void ActionDrawLineHorVert::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }