Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondimdiametric.cpp

diff --git a/src/actions/actiondimdiametric.cpp b/src/actions/actiondimdiametric.cpp
index fad94bf95207ca9bd72c3637f2347c068538cbd8..8b513501ac1f5e614ad8b222667822354231c75a 100644 (file)
--- a/src/actions/actiondimdiametric.cpp
+++ b/src/actions/actiondimdiametric.cpp
@@ -22,7 +22,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDimDiametric::ActionDimDiametric(RS_EntityContainer & container,
+ActionDimDiametric::ActionDimDiametric(EntityContainer & container,
        GraphicView & graphicView): ActionDimension("Draw Diametric Dimensions",
        container, graphicView)
 {
@@ -41,10 +41,10 @@ ActionDimDiametric::~ActionDimDiametric()
 void ActionDimDiametric::reset()
 {
        ActionDimension::reset();
-       edata = RS_DimDiametricData(Vector(false), 0.0);
+       edata = DimDiametricData(Vector(false), 0.0);
        entity = NULL;
        pos = Vector(false);
-       RS_DIALOGFACTORY->requestOptions(this, true, true);
+       DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimDiametric::trigger()
@@ -54,9 +54,9 @@ void ActionDimDiametric::trigger()
 
        if (entity)
        {
-               RS_DimDiametric * newEntity = NULL;
+               DimDiametric * newEntity = NULL;
 
-               newEntity = new RS_DimDiametric(container,
+               newEntity = new DimDiametric(container,
                                data,
                                edata);
 
@@ -80,7 +80,7 @@ void ActionDimDiametric::trigger()
                graphicView->moveRelativeZero(rz);
        }
        else
-               RS_DEBUG->print("ActionDimDiametric::trigger: Entity is NULL\n");
+               DEBUG->print("ActionDimDiametric::trigger: Entity is NULL\n");
 }
 
 void ActionDimDiametric::preparePreview()
@@ -92,13 +92,13 @@ void ActionDimDiametric::preparePreview()
 
                if (entity->rtti() == RS2::EntityArc)
                {
-                       radius = ((RS_Arc *)entity)->getRadius();
-                       center = ((RS_Arc *)entity)->getCenter();
+                       radius = ((Arc *)entity)->getRadius();
+                       center = ((Arc *)entity)->getCenter();
                }
                else if (entity->rtti() == RS2::EntityCircle)
                {
-                       radius = ((RS_Circle *)entity)->getRadius();
-                       center = ((RS_Circle *)entity)->getCenter();
+                       radius = ((Circle *)entity)->getRadius();
+                       center = ((Circle *)entity)->getCenter();
                }
                double angle = center.angleTo(pos);
 
@@ -112,7 +112,7 @@ void ActionDimDiametric::preparePreview()
 
 void ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDimDiametric::mouseMoveEvent begin");
+       DEBUG->print("ActionDimDiametric::mouseMoveEvent begin");
 
        Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
@@ -129,7 +129,7 @@ void ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
                        pos = snapPoint(e);
 
                        preparePreview();
-//                     RS_DimDiametric * d = new RS_DimDiametric(preview, data, edata);
+//                     DimDiametric * d = new DimDiametric(preview, data, edata);
 //                     d->update();
 //
 //                     deletePreview();
@@ -143,7 +143,7 @@ void ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionDimDiametric::mouseMoveEvent end");
+       DEBUG->print("ActionDimDiametric::mouseMoveEvent end");
 }
 
 void ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
@@ -153,7 +153,7 @@ void ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
                switch (getStatus())
                {
                case SetEntity: {
-                       RS_Entity * en = catchEntity(e, RS2::ResolveAll);
+                       Entity * en = catchEntity(e, RS2::ResolveAll);
 
                        if (en != NULL)
                        {
@@ -165,15 +165,15 @@ void ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
 
                                        if (entity->rtti() == RS2::EntityArc)
                                                center =
-                                                       ((RS_Arc *)entity)->getCenter();
+                                                       ((Arc *)entity)->getCenter();
                                        else if (entity->rtti() == RS2::EntityCircle)
                                                center =
-                                                       ((RS_Circle *)entity)->getCenter();
+                                                       ((Circle *)entity)->getCenter();
                                        graphicView->moveRelativeZero(center);
                                        setStatus(SetPos);
                                }
                                else
-                                       RS_DIALOGFACTORY->commandMessage(tr("Not a circle "
+                                       DIALOGFACTORY->commandMessage(tr("Not a circle "
                                                        "or arc entity"));
                        }
                }
@@ -217,13 +217,13 @@ void ActionDimDiametric::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDimDiametric::commandEvent(RS_CommandEvent * e)
+void ActionDimDiametric::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -232,7 +232,7 @@ void ActionDimDiametric::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;
@@ -250,18 +250,18 @@ void ActionDimDiametric::commandEvent(RS_CommandEvent * e)
        if (getStatus() == SetPos)
        {
                bool ok;
-               double a = RS_Math::eval(c, &ok);
+               double a = Math::eval(c, &ok);
 
                if (ok == true)
                {
-                       pos.setPolar(1.0, RS_Math::deg2rad(a));
+                       pos.setPolar(1.0, Math::deg2rad(a));
                        pos += data.definitionPoint;
                        trigger();
                        reset();
                        setStatus(SetEntity);
                }
                else
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
                return;
        }
 }
@@ -289,21 +289,21 @@ void ActionDimDiametric::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetEntity:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Select arc or circle entity"),
+               DIALOGFACTORY->updateMouseWidget(tr("Select arc or circle entity"),
                        tr("Cancel"));
                break;
 
        case SetPos:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify dimension 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;
        }
 }
@@ -312,13 +312,13 @@ void ActionDimDiametric::showOptions()
 {
        ActionInterface::showOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, true);
+       DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionDimDiametric::hideOptions()
 {
        ActionInterface::hideOptions();
 
-       //RS_DIALOGFACTORY->requestDimDiametricOptions(edata, false);
-       RS_DIALOGFACTORY->requestOptions(this, false);
+       //DIALOGFACTORY->requestDimDiametricOptions(edata, false);
+       DIALOGFACTORY->requestOptions(this, false);
 }