X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawlinefree.cpp;h=13230804b0de17a73cca8e0c8035c268efd3b1b3;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=9537cbee9a0b3b67fada49e6c671731930c25315;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/actions/actiondrawlinefree.cpp b/src/actions/actiondrawlinefree.cpp
index 9537cbe..1323080 100644
--- a/src/actions/actiondrawlinefree.cpp
+++ b/src/actions/actiondrawlinefree.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "polyline.h"
 
-ActionDrawLineFree::ActionDrawLineFree(RS_EntityContainer & container,
+ActionDrawLineFree::ActionDrawLineFree(EntityContainer & container,
 	GraphicView & graphicView): ActionInterface("Draw freehand lines",
 	container, graphicView)
 {
@@ -49,7 +49,7 @@ void ActionDrawLineFree::trigger()
 			document->endUndoCycle();
 		}
 
-		RS_DEBUG->print("ActionDrawLineFree::trigger():"
+		DEBUG->print("ActionDrawLineFree::trigger():"
 			" polyline added: %d", polyline->getId());
 		polyline = NULL;
 	}
@@ -60,7 +60,7 @@ void ActionDrawLineFree::mouseMoveEvent(QMouseEvent * e)
 	if (vertex.valid && polyline)
 	{
 		Vector v = snapPoint(e);
-		RS_Entity * ent = polyline->addVertex(v);
+		Entity * ent = polyline->addVertex(v);
 		ent->setLayerToActive();
 		ent->setPenToActive();
 
@@ -70,7 +70,7 @@ void ActionDrawLineFree::mouseMoveEvent(QMouseEvent * e)
 
 		vertex = v;
 
-		RS_DEBUG->print("ActionDrawLineFree::mouseMoveEvent():"
+		DEBUG->print("ActionDrawLineFree::mouseMoveEvent():"
 			" line added: %d", ent->getId());
 	}
 }
@@ -80,7 +80,7 @@ void ActionDrawLineFree::mousePressEvent(QMouseEvent * e)
 	if (e->button() == Qt::LeftButton)
 	{
 		vertex = snapPoint(e);
-		polyline = new RS_Polyline(container, RS_PolylineData(vertex, vertex, 0));
+		polyline = new Polyline(container, PolylineData(vertex, vertex, 0));
 		polyline->setLayerToActive();
 		polyline->setPenToActive();
 	}
@@ -111,11 +111,11 @@ void ActionDrawLineFree::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case 0:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Click and drag to draw a line"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Click and drag to draw a line"), tr("Cancel"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -128,7 +128,7 @@ void ActionDrawLineFree::updateMouseCursor()
 void ActionDrawLineFree::updateToolBar()
 {
 	if (!isFinished())
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 	else
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarLines);
 }