X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawpoint.cpp;h=891990def138b2f47c98e9f46be0e8ece433330b;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=f1ac97864570782df04234899cbf822a263da61a;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/actions/actiondrawpoint.cpp b/src/actions/actiondrawpoint.cpp
index f1ac978..891990d 100644
--- a/src/actions/actiondrawpoint.cpp
+++ b/src/actions/actiondrawpoint.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawPoint::ActionDrawPoint(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDrawPoint::ActionDrawPoint(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Draw Points", container, graphicView)
 {
 }
@@ -34,7 +34,7 @@ void ActionDrawPoint::trigger()
 {
 	if (pt.valid)
 	{
-		RS_Point * point = new RS_Point(container, RS_PointData(pt));
+		Point * point = new Point(container, PointData(pt));
 		container->addEntity(point);
 
 		if (document)
@@ -82,14 +82,14 @@ void ActionDrawPoint::coordinateEvent(Vector * e)
 	trigger();
 }
 
-void ActionDrawPoint::commandEvent(RS_CommandEvent * e)
+void ActionDrawPoint::commandEvent(CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
 	if (checkCommand("help", c))
 	{
-		if (RS_DIALOGFACTORY != NULL)
-			RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+		if (DIALOGFACTORY != NULL)
+			DIALOGFACTORY->commandMessage(msgAvailableCommands()
 				+ getAvailableCommands().join(", "));
 
 		return;
@@ -104,16 +104,16 @@ QStringList ActionDrawPoint::getAvailableCommands()
 
 void ActionDrawPoint::updateMouseButtonHints()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		switch (getStatus())
 		{
 		case 0:
-			RS_DIALOGFACTORY->updateMouseWidget(tr("Specify location"), tr("Cancel"));
+			DIALOGFACTORY->updateMouseWidget(tr("Specify location"), tr("Cancel"));
 			break;
 
 		default:
-			RS_DIALOGFACTORY->updateMouseWidget("", "");
+			DIALOGFACTORY->updateMouseWidget("", "");
 			break;
 		}
 	}
@@ -126,11 +126,11 @@ void ActionDrawPoint::updateMouseCursor()
 
 void ActionDrawPoint::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		if (!isFinished())
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		else
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarPoints);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarPoints);
 	}
 }