Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionmodifycut.cpp

diff --git a/src/actions/actionmodifycut.cpp b/src/actions/actionmodifycut.cpp
index b5ff8ceec2650901d5141320cdc31b95107af06e..228c3c75e137244022b2fa861c8f29c67084b341 100644 (file)
--- a/src/actions/actionmodifycut.cpp
+++ b/src/actions/actionmodifycut.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "modification.h"
 
-ActionModifyCut::ActionModifyCut(RS_EntityContainer & container,
+ActionModifyCut::ActionModifyCut(EntityContainer & container,
        GraphicView & graphicView): ActionInterface("Cut Entity",
                container, graphicView)
 {
@@ -40,7 +40,7 @@ void ActionModifyCut::init(int status)
 
 void ActionModifyCut::trigger()
 {
-       RS_DEBUG->print("ActionModifyCut::trigger()");
+       DEBUG->print("ActionModifyCut::trigger()");
 
        if (cutEntity != NULL && cutEntity->isAtomic() && cutCoord.valid
            && cutEntity->isPointOnEntity(cutCoord))
@@ -48,20 +48,20 @@ void ActionModifyCut::trigger()
                cutEntity->setHighlighted(false);
                graphicView->drawEntity(cutEntity);
 
-               RS_Modification m(*container, graphicView);
-               m.cut(cutCoord, (RS_AtomicEntity *)cutEntity);
+               Modification m(*container, graphicView);
+               m.cut(cutCoord, (AtomicEntity *)cutEntity);
 
                cutEntity = NULL;
                cutCoord = Vector(false);
                setStatus(ChooseCutEntity);
 
-               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
        }
 }
 
 void ActionModifyCut::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionModifyCut::mouseMoveEvent begin");
+       DEBUG->print("ActionModifyCut::mouseMoveEvent begin");
 
        switch (getStatus())
        {
@@ -76,7 +76,7 @@ void ActionModifyCut::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionModifyTrim::mouseMoveEvent end");
+       DEBUG->print("ActionModifyTrim::mouseMoveEvent end");
 }
 
 void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
@@ -89,13 +89,13 @@ void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
                        cutEntity = catchEntity(e);
 
                        if (cutEntity == NULL)
-                               RS_DIALOGFACTORY->commandMessage(tr("No Entity found."));
+                               DIALOGFACTORY->commandMessage(tr("No Entity found."));
                        else if (cutEntity->rtti() != RS2::EntityLine
                                && cutEntity->rtti() != RS2::EntityArc
                                && cutEntity->rtti() != RS2::EntityCircle
                                && cutEntity->rtti() != RS2::EntityEllipse)
 
-                               RS_DIALOGFACTORY->commandMessage(
+                               DIALOGFACTORY->commandMessage(
                                        tr("Entity must be a line, arc, circle or ellipse."));
                        else
                        {
@@ -109,11 +109,11 @@ void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
                        cutCoord = snapPoint(e);
 
                        if (cutEntity == NULL)
-                               RS_DIALOGFACTORY->commandMessage(tr("No Entity found."));
+                               DIALOGFACTORY->commandMessage(tr("No Entity found."));
                        else if (!cutCoord.valid)
-                               RS_DIALOGFACTORY->commandMessage(tr("Cutting point is invalid."));
+                               DIALOGFACTORY->commandMessage(tr("Cutting point is invalid."));
                        else if (!cutEntity->isPointOnEntity(cutCoord))
-                               RS_DIALOGFACTORY->commandMessage(
+                               DIALOGFACTORY->commandMessage(
                                        tr("Cutting point is not on entity."));
                        else
                        {
@@ -144,17 +144,17 @@ void ActionModifyCut::updateMouseButtonHints()
        switch (getStatus())
        {
        case ChooseCutEntity:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify entity to cut"),
+               DIALOGFACTORY->updateMouseWidget(tr("Specify entity to cut"),
                        tr("Cancel"));
                break;
 
        case SetCutCoord:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify cutting point"),
+               DIALOGFACTORY->updateMouseWidget(tr("Specify cutting point"),
                        tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -169,12 +169,12 @@ void ActionModifyCut::updateToolBar()
        switch (getStatus())
        {
        case SetCutCoord:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                break;
 
        case ChooseCutEntity:
        default:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
                break;
        }
 }