Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawlinetangent2.cpp

diff --git a/src/actions/actiondrawlinetangent2.cpp b/src/actions/actiondrawlinetangent2.cpp
index 7cf85862702f785e7d589054ded82a1f31aafdc3..4397560b1ac441e08ed17cacb897adad792573c7 100644 (file)
--- a/src/actions/actiondrawlinetangent2.cpp
+++ b/src/actions/actiondrawlinetangent2.cpp
@@ -23,7 +23,7 @@
 #include "preview.h"
 
 ActionDrawLineTangent2::ActionDrawLineTangent2(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Draw Tangents 2", container, graphicView)
 {
        tangent = NULL;
@@ -41,8 +41,8 @@ void ActionDrawLineTangent2::trigger()
 
        if (tangent != NULL)
        {
-               RS_Entity * newEntity = NULL;
-               newEntity = new RS_Line(container, tangent->getData());
+               Entity * newEntity = NULL;
+               newEntity = new Line(container, tangent->getData());
 
                if (newEntity != NULL)
                {
@@ -65,20 +65,20 @@ void ActionDrawLineTangent2::trigger()
                tangent = NULL;
        }
        else
-               RS_DEBUG->print("ActionDrawLineTangent2::trigger:"
+               DEBUG->print("ActionDrawLineTangent2::trigger:"
                        " Entity is NULL\n");
 }
 
 void ActionDrawLineTangent2::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawLineTangent2::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawLineTangent2::mouseMoveEvent begin");
 
        Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
        switch (getStatus())
        {
        case SetCircle1: {
-               RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+               Entity * en = catchEntity(e, RS2::ResolveAll);
 
                if (en != NULL && (en->rtti() == RS2::EntityCircle
                                   || en->rtti() == RS2::EntityArc))
@@ -88,21 +88,21 @@ void ActionDrawLineTangent2::mouseMoveEvent(QMouseEvent * e)
 
        case SetCircle2:
        {
-               RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+               Entity * en = catchEntity(e, RS2::ResolveAll);
 
                if (en && (en->rtti() == RS2::EntityCircle
                        || en->rtti() == RS2::EntityArc))
                {
                        circle2 = en;
-                       RS_Creation creation(NULL, NULL);
-                       RS_Line * t = creation.createTangent2(mouse, circle1, circle2);
+                       Creation creation(NULL, NULL);
+                       Line * t = creation.createTangent2(mouse, circle1, circle2);
 
                        if (t)
                        {
                                if (tangent)
                                        delete tangent;
 
-                               tangent = (RS_Line *)t->clone();
+                               tangent = (Line *)t->clone();
 
                                deletePreview();
                                clearPreview();
@@ -117,7 +117,7 @@ void ActionDrawLineTangent2::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionDrawLineTangent2::mouseMoveEvent end");
+       DEBUG->print("ActionDrawLineTangent2::mouseMoveEvent end");
 }
 
 void ActionDrawLineTangent2::mouseReleaseEvent(QMouseEvent * e)
@@ -145,22 +145,22 @@ void ActionDrawLineTangent2::mouseReleaseEvent(QMouseEvent * e)
 
 void ActionDrawLineTangent2::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetCircle1:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Select first circle or arc"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Select first circle or arc"),
                                tr("Cancel"));
                        break;
 
                case SetCircle2:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Select second circle or arc"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Select second circle or arc"),
                                tr("Back"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -173,6 +173,6 @@ void ActionDrawLineTangent2::updateMouseCursor()
 
 void ActionDrawLineTangent2::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+       if (DIALOGFACTORY != NULL)
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }