X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawspline.cpp;h=befd888db1b0bb3f93a620b46c75e4a4b9214763;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=9d06bf7933c7fadc999497029c3150df80497abf;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actiondrawspline.cpp b/src/actions/actiondrawspline.cpp
index 9d06bf7..befd888 100644
--- a/src/actions/actiondrawspline.cpp
+++ b/src/actions/actiondrawspline.cpp
@@ -16,19 +16,20 @@
 
 #include "actiondrawspline.h"
 
-#include "rs_commandevent.h"
+#include "commandevent.h"
 #include "commands.h"
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_preview.h"
+#include "preview.h"
 
-ActionDrawSpline::ActionDrawSpline(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDrawSpline::ActionDrawSpline(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Draw splines", container, graphicView)
 {
 	reset();
 #warning "!!! Need to port setAutoDelete() behaviour from Qt3 to Qt4 !!!"
 //	history.setAutoDelete(true);
-	data = RS_SplineData(3, false);
+	data = SplineData(3, false);
 	//bHistory.setAutoDelete(true);
 }
 
@@ -84,7 +85,7 @@ void ActionDrawSpline::trigger()
 	graphicView->drawEntity(spline);
 	graphicView->moveRelativeZero(r);
 	drawSnapper();
-	RS_DEBUG->print("ActionDrawSpline::trigger(): spline added: %d", spline->getId());
+	DEBUG->print("ActionDrawSpline::trigger(): spline added: %d", spline->getId());
 
 	spline = NULL;
 	//history.clear();
@@ -92,7 +93,7 @@ void ActionDrawSpline::trigger()
 
 void ActionDrawSpline::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionDrawSpline::mouseMoveEvent begin");
+	DEBUG->print("ActionDrawSpline::mouseMoveEvent begin");
 
 	Vector mouse = snapPoint(e);
 
@@ -101,7 +102,7 @@ void ActionDrawSpline::mouseMoveEvent(QMouseEvent * e)
 		deletePreview();
 		clearPreview();
 
-		RS_Spline * tmpSpline = (RS_Spline *)spline->clone();
+		Spline * tmpSpline = (Spline *)spline->clone();
 		tmpSpline->addControlPoint(mouse);
 		tmpSpline->update();
 // 		preview->addEntity(tmpSpline);
@@ -110,12 +111,12 @@ void ActionDrawSpline::mouseMoveEvent(QMouseEvent * e)
 		QList<Vector>::iterator it;
 
 // 		for(it=cpts.begin(); it!=cpts.end(); it+)
-// 			preview->addEntity(new RS_Point(preview, RS_PointData(*it)));
+// 			preview->addEntity(new Point(preview, PointData(*it)));
 
 		drawPreview();
 	}
 
-	RS_DEBUG->print("ActionDrawSpline::mouseMoveEvent end");
+	DEBUG->print("ActionDrawSpline::mouseMoveEvent end");
 }
 
 void ActionDrawSpline::mouseReleaseEvent(QMouseEvent * e)
@@ -152,7 +153,7 @@ void ActionDrawSpline::coordinateEvent(Vector * e)
 
 		if (!spline)
 		{
-			spline = new RS_Spline(container, data);
+			spline = new Spline(container, data);
 			spline->addControlPoint(mouse);
 		}
 
@@ -182,7 +183,7 @@ void ActionDrawSpline::coordinateEvent(Vector * e)
 	}
 }
 
-void ActionDrawSpline::commandEvent(RS_CommandEvent * e)
+void ActionDrawSpline::commandEvent(CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -191,7 +192,7 @@ void ActionDrawSpline::commandEvent(RS_CommandEvent * e)
 	case SetStartpoint:
 		if (checkCommand("help", c))
 		{
-			RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+			DIALOGFACTORY->commandMessage(msgAvailableCommands()
 				+ getAvailableCommands().join(", "));
 			return;
 		}
@@ -243,7 +244,7 @@ void ActionDrawSpline::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetStartpoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first control point"),
+		DIALOGFACTORY->updateMouseWidget(tr("Specify first control point"),
 			tr("Cancel"));
 		break;
 
@@ -253,26 +254,26 @@ void ActionDrawSpline::updateMouseButtonHints()
 
 		if (history.count() >= 3)
 		{
-			msg += RS_COMMANDS->command("close");
+			msg += COMMANDS->command("close");
 			msg += "/";
 		}
 
 		if (history.count() >= 2)
-			msg += RS_COMMANDS->command("undo");
+			msg += COMMANDS->command("undo");
 
 		if (history.count() >= 2)
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify next control point or [%1]").arg(msg),
 				tr("Back"));
 		else
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify next control point"),
 				tr("Back"));
 	}
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -280,13 +281,13 @@ void ActionDrawSpline::updateMouseButtonHints()
 void ActionDrawSpline::showOptions()
 {
 	ActionInterface::showOptions();
-	RS_DIALOGFACTORY->requestOptions(this, true);
+	DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionDrawSpline::hideOptions()
 {
 	ActionInterface::hideOptions();
-	RS_DIALOGFACTORY->requestOptions(this, false);
+	DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDrawSpline::updateMouseCursor()
@@ -297,9 +298,9 @@ void ActionDrawSpline::updateMouseCursor()
 void ActionDrawSpline::updateToolBar()
 {
 	if (!isFinished())
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 	else
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
 }
 
 void ActionDrawSpline::undo()
@@ -327,7 +328,7 @@ void ActionDrawSpline::undo()
 		}
 	}
 	else
-		RS_DIALOGFACTORY->commandMessage(
+		DIALOGFACTORY->commandMessage(
 			tr("Cannot undo: Not enough entities defined yet."));
 }