Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawlinefree.cpp

diff --git a/src/actions/actiondrawlinefree.cpp b/src/actions/actiondrawlinefree.cpp
index 9537cbee9a0b3b67fada49e6c671731930c25315..13230804b0de17a73cca8e0c8035c268efd3b1b3 100644 (file)
--- a/src/actions/actiondrawlinefree.cpp
+++ b/src/actions/actiondrawlinefree.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "polyline.h"
 
-ActionDrawLineFree::ActionDrawLineFree(RS_EntityContainer & container,
+ActionDrawLineFree::ActionDrawLineFree(EntityContainer & container,
        GraphicView & graphicView): ActionInterface("Draw freehand lines",
        container, graphicView)
 {
@@ -49,7 +49,7 @@ void ActionDrawLineFree::trigger()
                        document->endUndoCycle();
                }
 
-               RS_DEBUG->print("ActionDrawLineFree::trigger():"
+               DEBUG->print("ActionDrawLineFree::trigger():"
                        " polyline added: %d", polyline->getId());
                polyline = NULL;
        }
@@ -60,7 +60,7 @@ void ActionDrawLineFree::mouseMoveEvent(QMouseEvent * e)
        if (vertex.valid && polyline)
        {
                Vector v = snapPoint(e);
-               RS_Entity * ent = polyline->addVertex(v);
+               Entity * ent = polyline->addVertex(v);
                ent->setLayerToActive();
                ent->setPenToActive();
 
@@ -70,7 +70,7 @@ void ActionDrawLineFree::mouseMoveEvent(QMouseEvent * e)
 
                vertex = v;
 
-               RS_DEBUG->print("ActionDrawLineFree::mouseMoveEvent():"
+               DEBUG->print("ActionDrawLineFree::mouseMoveEvent():"
                        " line added: %d", ent->getId());
        }
 }
@@ -80,7 +80,7 @@ void ActionDrawLineFree::mousePressEvent(QMouseEvent * e)
        if (e->button() == Qt::LeftButton)
        {
                vertex = snapPoint(e);
-               polyline = new RS_Polyline(container, RS_PolylineData(vertex, vertex, 0));
+               polyline = new Polyline(container, PolylineData(vertex, vertex, 0));
                polyline->setLayerToActive();
                polyline->setPenToActive();
        }
@@ -111,11 +111,11 @@ void ActionDrawLineFree::updateMouseButtonHints()
        switch (getStatus())
        {
        case 0:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Click and drag to draw a line"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Click and drag to draw a line"), tr("Cancel"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -128,7 +128,7 @@ void ActionDrawLineFree::updateMouseCursor()
 void ActionDrawLineFree::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }