X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionmodifymirror.cpp;h=786aeeb1704c52afea9b56e8968e04be98572a47;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=44cc340200a7c63691ebb64505b0686850b130b6;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/actions/actionmodifymirror.cpp b/src/actions/actionmodifymirror.cpp
index 44cc340..786aeeb 100644
--- a/src/actions/actionmodifymirror.cpp
+++ b/src/actions/actionmodifymirror.cpp
@@ -16,11 +16,11 @@
 
 #include "actionmodifymirror.h"
 
-#include "rs_debug.h"
-#include "rs_dialogfactory.h"
-#include "rs_preview.h"
+#include "debug.h"
+#include "dialogfactory.h"
+#include "preview.h"
 
-ActionModifyMirror::ActionModifyMirror(RS_EntityContainer & container, GraphicView & graphicView):
+ActionModifyMirror::ActionModifyMirror(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Mirror Entities", container, graphicView)
 {
 }
@@ -36,18 +36,18 @@ void ActionModifyMirror::init(int status)
 
 void ActionModifyMirror::trigger()
 {
-	RS_DEBUG->print("ActionModifyMirror::trigger()");
+	DEBUG->print("ActionModifyMirror::trigger()");
 
-	RS_Modification m(*container, graphicView);
+	Modification m(*container, graphicView);
 	m.mirror(data);
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionModifyMirror::mouseMoveEvent begin");
+	DEBUG->print("ActionModifyMirror::mouseMoveEvent begin");
 
 	if (getStatus() == SetAxisPoint1 || getStatus() == SetAxisPoint2)
 	{
@@ -69,7 +69,7 @@ void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
 				clearPreview();
 /*				preview->addSelectionFrom(*container);
 				preview->mirror(axisPoint1, axisPoint2);
-				preview->addEntity(new RS_Line(preview,RS_LineData(axisPoint1, axisPoint2)));*/
+				preview->addEntity(new Line(preview,LineData(axisPoint1, axisPoint2)));*/
 				drawPreview();
 			}
 			break;
@@ -79,7 +79,7 @@ void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionModifyMirror::mouseMoveEvent end");
+	DEBUG->print("ActionModifyMirror::mouseMoveEvent end");
 }
 
 void ActionModifyMirror::mouseReleaseEvent(QMouseEvent * e)
@@ -117,9 +117,9 @@ void ActionModifyMirror::coordinateEvent(Vector * e)
 		setStatus(ShowDialog);
 		graphicView->moveRelativeZero(mouse);
 
-		if (RS_DIALOGFACTORY)
+		if (DIALOGFACTORY)
 		{
-			if (RS_DIALOGFACTORY->requestMirrorDialog(data))
+			if (DIALOGFACTORY->requestMirrorDialog(data))
 			{
 				data.axisPoint1 = axisPoint1;
 				data.axisPoint2 = axisPoint2;
@@ -138,28 +138,28 @@ void ActionModifyMirror::coordinateEvent(Vector * e)
 
 void ActionModifyMirror::updateMouseButtonHints()
 {
-	if (RS_DIALOGFACTORY)
+	if (DIALOGFACTORY)
 	{
 		switch (getStatus())
 		{
 		/*case Select:
-		    RS_DIALOGFACTORY->updateMouseWidget(tr("Pick entities to move"),
+		    DIALOGFACTORY->updateMouseWidget(tr("Pick entities to move"),
 		                                   tr("Cancel"));
 		    break;*/
 		case SetAxisPoint1:
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify first point of mirror line"),
 				tr("Cancel"));
 			break;
 
 		case SetAxisPoint2:
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify second point of mirror line"),
 				tr("Back"));
 			break;
 
 		default:
-			RS_DIALOGFACTORY->updateMouseWidget("", "");
+			DIALOGFACTORY->updateMouseWidget("", "");
 			break;
 		}
 	}
@@ -172,17 +172,17 @@ void ActionModifyMirror::updateMouseCursor()
 
 void ActionModifyMirror::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		switch (getStatus())
 		{
 		case SetAxisPoint1:
 		case SetAxisPoint2:
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 			break;
 
 		default:
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 			break;
 		}
 	}