X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factioninfototallength.cpp;h=05a03c7d1aad052f3fe9c3667aac192b9e1c839f;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=ae58f007d3ba6da66aa189b283ce3398b0d00044;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/actions/actioninfototallength.cpp b/src/actions/actioninfototallength.cpp
index ae58f00..05a03c7 100644
--- a/src/actions/actioninfototallength.cpp
+++ b/src/actions/actioninfototallength.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,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)
 {
 }
@@ -33,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())
@@ -55,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();
@@ -66,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);
 	}
 }