X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factioninfototallength.cpp;h=05a03c7d1aad052f3fe9c3667aac192b9e1c839f;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=0155270a35ea2aa7fc4135b779468146812de26a;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actioninfototallength.cpp b/src/actions/actioninfototallength.cpp
index 0155270..05a03c7 100644
--- a/src/actions/actioninfototallength.cpp
+++ b/src/actions/actioninfototallength.cpp
@@ -16,9 +16,10 @@
 
 #include "actioninfototallength.h"
 
-#include "rs_dialogfactory.h"
+#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)
 {
 }
@@ -35,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())
@@ -57,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();
@@ -68,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);
 	}
 }