X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionmodifymoverotate.cpp;h=9185d6c4597b1483bea01246e22393ca6adcee83;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=961ab2ad489979f3cc6f1edc42e7b9c23d249c3d;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/actions/actionmodifymoverotate.cpp b/src/actions/actionmodifymoverotate.cpp
index 961ab2a..9185d6c 100644
--- a/src/actions/actionmodifymoverotate.cpp
+++ b/src/actions/actionmodifymoverotate.cpp
@@ -16,13 +16,13 @@
 
 #include "actionmodifymoverotate.h"
 
-#include "rs_commandevent.h"
-#include "rs_debug.h"
-#include "rs_dialogfactory.h"
-#include "rs_preview.h"
+#include "commandevent.h"
+#include "debug.h"
+#include "dialogfactory.h"
+#include "preview.h"
 
 ActionModifyMoveRotate::ActionModifyMoveRotate(
-	RS_EntityContainer & container, GraphicView & graphicView):
+	EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Move and Rotate Entities", container, graphicView)
 {
 }
@@ -43,19 +43,19 @@ void ActionModifyMoveRotate::init(int status)
 
 void ActionModifyMoveRotate::trigger()
 {
-	RS_DEBUG->print("ActionModifyMoveRotate::trigger()");
+	DEBUG->print("ActionModifyMoveRotate::trigger()");
 
-	RS_Modification m(*container, graphicView);
+	Modification m(*container, graphicView);
 	m.moveRotate(data);
 
 	finish();
 
-	RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+	DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyMoveRotate::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionModifyMoveRotate::mouseMoveEvent begin");
+	DEBUG->print("ActionModifyMoveRotate::mouseMoveEvent begin");
 
 	if (getStatus() == SetReferencePoint || getStatus() == SetTargetPoint)
 	{
@@ -88,7 +88,7 @@ void ActionModifyMoveRotate::mouseMoveEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionModifyMoveRotate::mouseMoveEvent end");
+	DEBUG->print("ActionModifyMoveRotate::mouseMoveEvent end");
 }
 
 void ActionModifyMoveRotate::mouseReleaseEvent(QMouseEvent * e)
@@ -126,7 +126,7 @@ void ActionModifyMoveRotate::coordinateEvent(Vector * e)
 		setStatus(ShowDialog);
 		data.offset = targetPoint - data.referencePoint;
 
-		if (RS_DIALOGFACTORY->requestMoveRotateDialog(data))
+		if (DIALOGFACTORY->requestMoveRotateDialog(data))
 			trigger();
 			//finish();
 		break;
@@ -136,13 +136,13 @@ void ActionModifyMoveRotate::coordinateEvent(Vector * e)
 	}
 }
 
-void ActionModifyMoveRotate::commandEvent(RS_CommandEvent * e)
+void ActionModifyMoveRotate::commandEvent(CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
 	if (checkCommand("help", c))
 	{
-		RS_DIALOGFACTORY->commandMessage(msgAvailableCommands() + getAvailableCommands().join(", "));
+		DIALOGFACTORY->commandMessage(msgAvailableCommands() + getAvailableCommands().join(", "));
 		return;
 	}
 
@@ -166,14 +166,14 @@ void ActionModifyMoveRotate::commandEvent(RS_CommandEvent * e)
 	case SetAngle:
 	{
 		bool ok;
-		double a = RS_Math::eval(c, &ok);
+		double a = Math::eval(c, &ok);
 
 		if (ok)
-			data.angle = RS_Math::deg2rad(a);
+			data.angle = Math::deg2rad(a);
 		else
-			RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+			DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
-		RS_DIALOGFACTORY->requestOptions(this, true, true);
+		DIALOGFACTORY->requestOptions(this, true, true);
 		setStatus(lastStatus);
 	}
 	break;
@@ -204,7 +204,7 @@ void ActionModifyMoveRotate::showOptions()
 
 	ActionInterface::showOptions();
 
-	RS_DIALOGFACTORY->requestOptions(this, true);
+	DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionModifyMoveRotate::hideOptions()
@@ -213,7 +213,7 @@ void ActionModifyMoveRotate::hideOptions()
 
 	ActionInterface::hideOptions();
 
-	RS_DIALOGFACTORY->requestOptions(this, false);
+	DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionModifyMoveRotate::updateMouseButtonHints()
@@ -221,19 +221,19 @@ void ActionModifyMoveRotate::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetReferencePoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
 		break;
 
 	case SetTargetPoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify target point"), tr("Back"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify target point"), tr("Back"));
 		break;
 
 	case SetAngle:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Enter rotation angle:"), tr("Back"));
+		DIALOGFACTORY->updateMouseWidget(tr("Enter rotation angle:"), tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -249,11 +249,11 @@ void ActionModifyMoveRotate::updateToolBar()
 	{
 	case SetReferencePoint:
 	case SetTargetPoint:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		break;
 
 	default:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 		break;
 	}
 }