Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actioninfoinside.cpp

diff --git a/src/actions/actioninfoinside.cpp b/src/actions/actioninfoinside.cpp
index b31958d63756c6cb84ab75d6a6b15f756adba625..7d7c734d921fdc8b349710e3e88f564b5e9ba154 100644 (file)
--- a/src/actions/actioninfoinside.cpp
+++ b/src/actions/actioninfoinside.cpp
@@ -20,12 +20,12 @@
 #include "graphicview.h"
 #include "information.h"
 
-ActionInfoInside::ActionInfoInside(RS_EntityContainer & container, GraphicView & graphicView):
+ActionInfoInside::ActionInfoInside(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Info Inside", container, graphicView)
 {
-       contour = new RS_EntityContainer(NULL, false);
+       contour = new EntityContainer(NULL, false);
 
-       for (RS_Entity * e = container.firstEntity(); e != NULL; e = container.nextEntity())
+       for (Entity * e = container.firstEntity(); e != NULL; e = container.nextEntity())
                if (e->isSelected())
                        contour->addEntity(e);
 }
@@ -40,10 +40,10 @@ void ActionInfoInside::trigger()
        deleteSnapper();
        bool onContour = false;
 
-       if (RS_Information::isPointInsideContour(pt, contour, &onContour))
-               RS_DIALOGFACTORY->commandMessage(tr("Point is inside selected contour."));
+       if (Information::isPointInsideContour(pt, contour, &onContour))
+               DIALOGFACTORY->commandMessage(tr("Point is inside selected contour."));
        else
-               RS_DIALOGFACTORY->commandMessage(tr("Point is outside selected contour."));
+               DIALOGFACTORY->commandMessage(tr("Point is outside selected contour."));
 
        finish();
 }
@@ -71,11 +71,11 @@ void ActionInfoInside::updateMouseButtonHints()
        switch (getStatus())
        {
        case 0:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Cancel"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -88,7 +88,7 @@ void ActionInfoInside::updateMouseCursor()
 void ActionInfoInside::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
 }