X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factioninfodist2.cpp;h=a3402f25a5997361ef4e25c7835b09279bd09943;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=c215e3183ccfa770f7388af0a0a4d25b3aa586ac;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/actions/actioninfodist2.cpp b/src/actions/actioninfodist2.cpp
index c215e31..a3402f2 100644
--- a/src/actions/actioninfodist2.cpp
+++ b/src/actions/actioninfodist2.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionInfoDist2::ActionInfoDist2(RS_EntityContainer & container, GraphicView & graphicView):
+ActionInfoDist2::ActionInfoDist2(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Info Dist2", container, graphicView)
 {
 }
@@ -37,7 +37,7 @@ void ActionInfoDist2::init(int status)
 
 void ActionInfoDist2::trigger()
 {
-	RS_DEBUG->print("ActionInfoDist2::trigger()");
+	DEBUG->print("ActionInfoDist2::trigger()");
 	deleteSnapper();
 
 	if (point.valid && entity != NULL)
@@ -45,13 +45,13 @@ void ActionInfoDist2::trigger()
 		double dist = entity->getDistanceToPoint(point);
 		QString str;
 		str.sprintf("%.6f", dist);
-		RS_DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
+		DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
 	}
 }
 
 void ActionInfoDist2::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionInfoDist2::mouseMoveEvent begin");
+	DEBUG->print("ActionInfoDist2::mouseMoveEvent begin");
 
 	switch (getStatus())
 	{
@@ -69,7 +69,7 @@ void ActionInfoDist2::mouseMoveEvent(QMouseEvent * e)
 		break;
 	}
 
-	RS_DEBUG->print("ActionInfoDist2::mouseMoveEvent end");
+	DEBUG->print("ActionInfoDist2::mouseMoveEvent end");
 }
 
 void ActionInfoDist2::mouseReleaseEvent(QMouseEvent * e)
@@ -123,15 +123,15 @@ void ActionInfoDist2::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetEntity:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify entity"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify entity"), tr("Cancel"));
 		break;
 
 	case SetPoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Back"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify point"), tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -147,11 +147,11 @@ void ActionInfoDist2::updateToolBar()
 	{
 	case SetPoint:
 	case SetEntity:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		break;
 
 	default:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
 		break;
 	}
 }