Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondimangular.cpp

diff --git a/src/actions/actiondimangular.cpp b/src/actions/actiondimangular.cpp
index d2da018ab5a6f212a3fba01e3ac361382688b8e3..b672222b32eb83dc68c9bfcde92db8a981bee218 100644 (file)
--- a/src/actions/actiondimangular.cpp
+++ b/src/actions/actiondimangular.cpp
@@ -23,7 +23,7 @@
 #include "information.h"
 #include "preview.h"
 
-ActionDimAngular::ActionDimAngular(RS_EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw Angular Dimensions",
+ActionDimAngular::ActionDimAngular(EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw Angular Dimensions",
                container, graphicView)
 {
        reset();
@@ -41,11 +41,11 @@ ActionDimAngular::~ActionDimAngular()
 void ActionDimAngular::reset()
 {
        ActionDimension::reset();
-       edata = RS_DimAngularData(Vector(false), Vector(false), Vector(false), Vector(false));
+       edata = DimAngularData(Vector(false), Vector(false), Vector(false), Vector(false));
        line1 = NULL;
        line2 = NULL;
        center = Vector(false);
-       RS_DIALOGFACTORY->requestOptions(this, true, true);
+       DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimAngular::trigger()
@@ -54,9 +54,9 @@ void ActionDimAngular::trigger()
 
        if (line1 != NULL && line2 != NULL)
        {
-               RS_DimAngular * newEntity = NULL;
+               DimAngular * newEntity = NULL;
 
-               newEntity = new RS_DimAngular(container,
+               newEntity = new DimAngular(container,
                                data,
                                edata);
 
@@ -79,13 +79,13 @@ void ActionDimAngular::trigger()
                graphicView->moveRelativeZero(rz);
        }
        else
-               RS_DEBUG->print("ActionDimAngular::trigger:"
+               DEBUG->print("ActionDimAngular::trigger:"
                        " Entity is NULL\n");
 }
 
 void ActionDimAngular::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDimAngular::mouseMoveEvent begin");
+       DEBUG->print("ActionDimAngular::mouseMoveEvent begin");
 
        Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
@@ -104,7 +104,7 @@ void ActionDimAngular::mouseMoveEvent(QMouseEvent * e)
                        Vector mouse = snapPoint(e);
                        edata.definitionPoint4 = mouse;
 
-//                     RS_DimAngular * d = new RS_DimAngular(preview, data, edata);
+//                     DimAngular * d = new DimAngular(preview, data, edata);
 //                     d->update();
 //
 //                     deletePreview();
@@ -118,7 +118,7 @@ void ActionDimAngular::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionDimAngular::mouseMoveEvent end");
+       DEBUG->print("ActionDimAngular::mouseMoveEvent end");
 }
 
 void ActionDimAngular::mouseReleaseEvent(QMouseEvent * e)
@@ -129,12 +129,12 @@ void ActionDimAngular::mouseReleaseEvent(QMouseEvent * e)
                {
                case SetLine1:
                {
-                       RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+                       Entity * en = catchEntity(e, RS2::ResolveAll);
 
                        if (en != NULL
                            && en->rtti() == RS2::EntityLine)
                        {
-                               line1 = (RS_Line *)en;
+                               line1 = (Line *)en;
                                setStatus(SetLine2);
                        }
                }
@@ -142,15 +142,15 @@ void ActionDimAngular::mouseReleaseEvent(QMouseEvent * e)
 
                case SetLine2:
                {
-                       RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+                       Entity * en = catchEntity(e, RS2::ResolveAll);
 
                        if (en != NULL
                            && en->rtti() == RS2::EntityLine)
                        {
-                               line2 = (RS_Line *)en;
+                               line2 = (Line *)en;
 
                                VectorSolutions sol =
-                                       RS_Information::getIntersectionLineLine(line1, line2);
+                                       Information::getIntersectionLineLine(line1, line2);
 
                                if (sol.get(0).valid)
                                {
@@ -222,13 +222,13 @@ void ActionDimAngular::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDimAngular::commandEvent(RS_CommandEvent * e)
+void ActionDimAngular::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -237,7 +237,7 @@ void ActionDimAngular::commandEvent(RS_CommandEvent * e)
        if (getStatus() == SetText)
        {
                setText(c);
-               RS_DIALOGFACTORY->requestOptions(this, true, true);
+               DIALOGFACTORY->requestOptions(this, true, true);
                graphicView->enableCoordinateInput();
                setStatus(lastStatus);
                return;
@@ -275,14 +275,14 @@ void ActionDimAngular::showOptions()
 {
        ActionInterface::showOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, true);
+       DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionDimAngular::hideOptions()
 {
        ActionInterface::hideOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, false);
+       DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDimAngular::updateMouseButtonHints()
@@ -290,26 +290,26 @@ void ActionDimAngular::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetLine1:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Select first line"),
+               DIALOGFACTORY->updateMouseWidget(tr("Select first line"),
                        tr("Cancel"));
                break;
 
        case SetLine2:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Select second line"),
+               DIALOGFACTORY->updateMouseWidget(tr("Select second line"),
                        tr("Cancel"));
                break;
 
        case SetPos:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify dimension arc line location"), tr("Cancel"));
                break;
 
        case SetText:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Enter dimension text:"), "");
+               DIALOGFACTORY->updateMouseWidget(tr("Enter dimension text:"), "");
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }