Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawlinetangent1.cpp

diff --git a/src/actions/actiondrawlinetangent1.cpp b/src/actions/actiondrawlinetangent1.cpp
index 28c1ea1c68ee007681cc574564cedf0d729e2c94..045ae6de44c081794612a71a7af7c9938ba03ef9 100644 (file)
--- a/src/actions/actiondrawlinetangent1.cpp
+++ b/src/actions/actiondrawlinetangent1.cpp
@@ -22,7 +22,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawLineTangent1::ActionDrawLineTangent1(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Tangents 1",
+ActionDrawLineTangent1::ActionDrawLineTangent1(EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Tangents 1",
                container, graphicView)
 {
        tangent = NULL;
@@ -40,8 +40,8 @@ void ActionDrawLineTangent1::trigger()
 
        if (tangent)
        {
-               RS_Entity * newEntity = NULL;
-               newEntity = new RS_Line(container, tangent->getData());
+               Entity * newEntity = NULL;
+               newEntity = new Line(container, tangent->getData());
 
                if (newEntity)
                {
@@ -67,13 +67,13 @@ void ActionDrawLineTangent1::trigger()
                tangent = NULL;
        }
        else
-               RS_DEBUG->print("ActionDrawLineTangent1::trigger:"
+               DEBUG->print("ActionDrawLineTangent1::trigger:"
                        " Entity is NULL\n");
 }
 
 void ActionDrawLineTangent1::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawLineTangent1::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawLineTangent1::mouseMoveEvent begin");
        Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
        switch (getStatus())
@@ -84,22 +84,22 @@ void ActionDrawLineTangent1::mouseMoveEvent(QMouseEvent * e)
 
        case SetCircle:
        {
-               RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+               Entity * en = catchEntity(e, RS2::ResolveAll);
 
                if (en && (en->rtti() == RS2::EntityCircle
                        || en->rtti() == RS2::EntityArc
                        || en->rtti() == RS2::EntityEllipse))
                {
                        circle = en;
-                       RS_Creation creation(NULL, NULL);
-                       RS_Line * t = creation.createTangent1(mouse, point, circle);
+                       Creation creation(NULL, NULL);
+                       Line * t = creation.createTangent1(mouse, point, circle);
 
                        if (t)
                        {
                                if (tangent)
                                        delete tangent;
 
-                               tangent = (RS_Line *)t->clone();
+                               tangent = (Line *)t->clone();
 
                                deletePreview();
                                clearPreview();
@@ -114,7 +114,7 @@ void ActionDrawLineTangent1::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionDrawLineTangent1::mouseMoveEvent end");
+       DEBUG->print("ActionDrawLineTangent1::mouseMoveEvent end");
 }
 
 void ActionDrawLineTangent1::mouseReleaseEvent(QMouseEvent * e)
@@ -165,21 +165,21 @@ void ActionDrawLineTangent1::coordinateEvent(Vector * e)
 
 void ActionDrawLineTangent1::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetPoint:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Cancel"));
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Cancel"));
                        break;
 
                case SetCircle:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Select circle, arc or ellipse"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Select circle, arc or ellipse"),
                                tr("Back"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -192,11 +192,11 @@ void ActionDrawLineTangent1::updateMouseCursor()
 
 void ActionDrawLineTangent1::updateToolBar()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
        }
 }