X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawlinehorvert.cpp;h=3d3f24bcbcc9fc0d81a511c7fd9a22cb4c30b2ed;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=294b2f0395b1f50ca17ad4b3fe4f78c5d9e8fc25;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actiondrawlinehorvert.cpp b/src/actions/actiondrawlinehorvert.cpp
index 294b2f0..3d3f24b 100644
--- a/src/actions/actiondrawlinehorvert.cpp
+++ b/src/actions/actiondrawlinehorvert.cpp
@@ -16,15 +16,16 @@
 
 #include "actiondrawlinehorvert.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_preview.h"
+#include "preview.h"
 
-ActionDrawLineHorVert::ActionDrawLineHorVert(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw horizontal/vertical lines",
+ActionDrawLineHorVert::ActionDrawLineHorVert(EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw horizontal/vertical lines",
 		container, graphicView)
 {
 	reset();
-	RS_DEBUG->print("ActionDrawLineHorVert::constructor");
+	DEBUG->print("ActionDrawLineHorVert::constructor");
 }
 
 ActionDrawLineHorVert::~ActionDrawLineHorVert()
@@ -33,21 +34,21 @@ ActionDrawLineHorVert::~ActionDrawLineHorVert()
 
 void ActionDrawLineHorVert::reset()
 {
-	data = RS_LineData(Vector(false), Vector(false));
+	data = LineData(Vector(false), Vector(false));
 }
 
 void ActionDrawLineHorVert::init(int status)
 {
 	ActionInterface::init(status);
 	reset();
-	RS_DEBUG->print("ActionDrawLineHorVert::init");
+	DEBUG->print("ActionDrawLineHorVert::init");
 }
 
 void ActionDrawLineHorVert::trigger()
 {
 	ActionInterface::trigger();
 
-	RS_Line * line = new RS_Line(container, data);
+	Line * line = new Line(container, data);
 	line->setLayerToActive();
 	line->setPenToActive();
 	container->addEntity(line);
@@ -64,13 +65,13 @@ void ActionDrawLineHorVert::trigger()
 	graphicView->moveRelativeZero(Vector(0.0, 0.0));
 	graphicView->drawEntity(line);
 	graphicView->moveRelativeZero(line->getMiddlepoint());
-	RS_DEBUG->print("ActionDrawLineHorVert::trigger():"
+	DEBUG->print("ActionDrawLineHorVert::trigger():"
 		" line added: %d", line->getId());
 }
 
 void ActionDrawLineHorVert::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent begin");
+	DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent begin");
 
 	Vector mouse = snapPoint(e);
 
@@ -86,12 +87,12 @@ void ActionDrawLineHorVert::mouseMoveEvent(QMouseEvent * e)
 
 		deletePreview();
 		clearPreview();
-		data = RS_LineData(p1, p2);
-// 		preview->addEntity(new RS_Line(preview, data));
+		data = LineData(p1, p2);
+// 		preview->addEntity(new Line(preview, data));
 		drawPreview();
 	}
 
-	RS_DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent end");
+	DEBUG->print("ActionDrawLineHorVert::mouseMoveEvent end");
 }
 
 void ActionDrawLineHorVert::mouseReleaseEvent(QMouseEvent * e)
@@ -130,15 +131,15 @@ void ActionDrawLineHorVert::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetStartpoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
 		break;
 
 	case SetEndpoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -151,7 +152,7 @@ void ActionDrawLineHorVert::updateMouseCursor()
 void ActionDrawLineHorVert::updateToolBar()
 {
 	if (!isFinished())
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 	else
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }