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

diff --git a/src/actions/actionmodifyscale.cpp b/src/actions/actionmodifyscale.cpp
index e4d8dce..d1aadc9 100644
--- a/src/actions/actionmodifyscale.cpp
+++ b/src/actions/actionmodifyscale.cpp
@@ -16,9 +16,10 @@
 
 #include "actionmodifyscale.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 
-ActionModifyScale::ActionModifyScale(RS_EntityContainer & container, GraphicView & graphicView):
+ActionModifyScale::ActionModifyScale(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Scale Entities", container, graphicView)
 {
 }
@@ -34,17 +35,17 @@ void ActionModifyScale::init(int status)
 
 void ActionModifyScale::trigger()
 {
-	RS_DEBUG->print("ActionModifyScale::trigger()");
+	DEBUG->print("ActionModifyScale::trigger()");
 
-	RS_Modification m(*container, graphicView);
+	Modification m(*container, graphicView);
 	m.scale(data);
 
-	RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+	DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyScale::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionModifyScale::mouseMoveEvent begin");
+	DEBUG->print("ActionModifyScale::mouseMoveEvent begin");
 
 	if (getStatus() == SetReferencePoint)
 	{
@@ -61,7 +62,7 @@ void ActionModifyScale::mouseMoveEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionModifyScale::mouseMoveEvent end");
+	DEBUG->print("ActionModifyScale::mouseMoveEvent end");
 }
 
 void ActionModifyScale::mouseReleaseEvent(QMouseEvent * e)
@@ -75,7 +76,7 @@ void ActionModifyScale::mouseReleaseEvent(QMouseEvent * e)
 		case SetReferencePoint:
 			setStatus(ShowDialog);
 
-			if (RS_DIALOGFACTORY->requestScaleDialog(data))
+			if (DIALOGFACTORY->requestScaleDialog(data))
 			{
 				data.referencePoint = referencePoint;
 				trigger();
@@ -100,11 +101,11 @@ void ActionModifyScale::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case SetReferencePoint:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -119,11 +120,11 @@ void ActionModifyScale::updateToolBar()
 	switch (getStatus())
 	{
 	case SetReferencePoint:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		break;
 
 	default:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 		break;
 	}
 }