X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factioninfodist.cpp;h=02067915bf54ae09dc17c3174cf91aedbeae761b;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=f14006c1e277e653652b5e499880d1e5061745de;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actioninfodist.cpp b/src/actions/actioninfodist.cpp
index f14006c..0206791 100644
--- a/src/actions/actioninfodist.cpp
+++ b/src/actions/actioninfodist.cpp
@@ -16,11 +16,12 @@
 
 #include "actioninfodist.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_preview.h"
+#include "preview.h"
 
-ActionInfoDist::ActionInfoDist(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist",
+ActionInfoDist::ActionInfoDist(EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist",
 		container, graphicView)
 {
 }
@@ -36,20 +37,20 @@ void ActionInfoDist::init(int status)
 
 void ActionInfoDist::trigger()
 {
-	RS_DEBUG->print("ActionInfoDist::trigger()");
+	DEBUG->print("ActionInfoDist::trigger()");
 
 	if (point1.valid && point2.valid)
 	{
 		double dist = point1.distanceTo(point2);
 		QString str;
 		str.sprintf("%.6f", dist);
-		RS_DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
+		DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
 	}
 }
 
 void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionInfoDist::mouseMoveEvent begin");
+	DEBUG->print("ActionInfoDist::mouseMoveEvent begin");
 
 	if (getStatus() == SetPoint1
 	    || getStatus() == SetPoint2)
@@ -69,7 +70,7 @@ void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 
 				deletePreview();
 				clearPreview();
-//				preview->addEntity(new RS_Line(preview, RS_LineData(point1, point2)));
+//				preview->addEntity(new Line(preview, LineData(point1, point2)));
 				drawPreview();
 			}
 			break;
@@ -79,7 +80,7 @@ void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionInfoDist::mouseMoveEvent end");
+	DEBUG->print("ActionInfoDist::mouseMoveEvent end");
 }
 
 void ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
@@ -135,19 +136,19 @@ void ActionInfoDist::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetPoint1:
-		RS_DIALOGFACTORY->updateMouseWidget(
+		DIALOGFACTORY->updateMouseWidget(
 			tr("Specify first point of distance"),
 			tr("Cancel"));
 		break;
 
 	case SetPoint2:
-		RS_DIALOGFACTORY->updateMouseWidget(
+		DIALOGFACTORY->updateMouseWidget(
 			tr("Specify second point of distance"),
 			tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -163,11 +164,11 @@ void ActionInfoDist::updateToolBar()
 	{
 	case SetPoint1:
 	case SetPoint2:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		break;
 
 	default:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
 		break;
 	}
 }