Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actioninfototallength.cpp

diff --git a/src/actions/actioninfototallength.cpp b/src/actions/actioninfototallength.cpp
index 5abe6445652778ee4e4935571bd49e671703c577..05a03c7d1aad052f3fe9c3667aac192b9e1c839f 100644 (file)
--- a/src/actions/actioninfototallength.cpp
+++ b/src/actions/actioninfototallength.cpp
@@ -19,7 +19,7 @@
 #include "debug.h"
 #include "dialogfactory.h"
 
-ActionInfoTotalLength::ActionInfoTotalLength(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Total Length",
+ActionInfoTotalLength::ActionInfoTotalLength(EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Total Length",
                container, graphicView)
 {
 }
@@ -36,11 +36,11 @@ void ActionInfoTotalLength::init(int status)
 
 void ActionInfoTotalLength::trigger()
 {
-       RS_DEBUG->print("ActionInfoTotalLength::trigger()");
+       DEBUG->print("ActionInfoTotalLength::trigger()");
 
        double len = 0.0;
 
-       for(RS_Entity * e=container->firstEntity(RS2::ResolveNone); e!=NULL;
+       for(Entity * e=container->firstEntity(RS2::ResolveNone); e!=NULL;
                e=container->nextEntity(RS2::ResolveNone))
        {
                if (e->isVisible() && e->isSelected())
@@ -58,10 +58,10 @@ void ActionInfoTotalLength::trigger()
        }
 
        if (len > 0.0)
-               RS_DIALOGFACTORY->commandMessage(
+               DIALOGFACTORY->commandMessage(
                        tr("Total Length of selected entities: %1").arg(len));
        else
-               RS_DIALOGFACTORY->commandMessage(tr("At least one of the selected "
+               DIALOGFACTORY->commandMessage(tr("At least one of the selected "
                                "entities cannot be measured."));
 
        finish();
@@ -69,11 +69,11 @@ void ActionInfoTotalLength::trigger()
 
 void ActionInfoTotalLength::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
        }
 }