X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionmodifycut.cpp;h=228c3c75e137244022b2fa861c8f29c67084b341;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=000c75a675cce393242544569d0726e649b9f085;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actionmodifycut.cpp b/src/actions/actionmodifycut.cpp
index 000c75a..228c3c7 100644
--- a/src/actions/actionmodifycut.cpp
+++ b/src/actions/actionmodifycut.cpp
@@ -16,11 +16,12 @@
 
 #include "actionmodifycut.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_modification.h"
+#include "modification.h"
 
-ActionModifyCut::ActionModifyCut(RS_EntityContainer & container,
+ActionModifyCut::ActionModifyCut(EntityContainer & container,
 	GraphicView & graphicView): ActionInterface("Cut Entity",
 		container, graphicView)
 {
@@ -39,7 +40,7 @@ void ActionModifyCut::init(int status)
 
 void ActionModifyCut::trigger()
 {
-	RS_DEBUG->print("ActionModifyCut::trigger()");
+	DEBUG->print("ActionModifyCut::trigger()");
 
 	if (cutEntity != NULL && cutEntity->isAtomic() && cutCoord.valid
 	    && cutEntity->isPointOnEntity(cutCoord))
@@ -47,20 +48,20 @@ void ActionModifyCut::trigger()
 		cutEntity->setHighlighted(false);
 		graphicView->drawEntity(cutEntity);
 
-		RS_Modification m(*container, graphicView);
-		m.cut(cutCoord, (RS_AtomicEntity *)cutEntity);
+		Modification m(*container, graphicView);
+		m.cut(cutCoord, (AtomicEntity *)cutEntity);
 
 		cutEntity = NULL;
 		cutCoord = Vector(false);
 		setStatus(ChooseCutEntity);
 
-		RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+		DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 	}
 }
 
 void ActionModifyCut::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionModifyCut::mouseMoveEvent begin");
+	DEBUG->print("ActionModifyCut::mouseMoveEvent begin");
 
 	switch (getStatus())
 	{
@@ -75,7 +76,7 @@ void ActionModifyCut::mouseMoveEvent(QMouseEvent * e)
 		break;
 	}
 
-	RS_DEBUG->print("ActionModifyTrim::mouseMoveEvent end");
+	DEBUG->print("ActionModifyTrim::mouseMoveEvent end");
 }
 
 void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
@@ -88,13 +89,13 @@ void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
 			cutEntity = catchEntity(e);
 
 			if (cutEntity == NULL)
-				RS_DIALOGFACTORY->commandMessage(tr("No Entity found."));
+				DIALOGFACTORY->commandMessage(tr("No Entity found."));
 			else if (cutEntity->rtti() != RS2::EntityLine
 				&& cutEntity->rtti() != RS2::EntityArc
 				&& cutEntity->rtti() != RS2::EntityCircle
 				&& cutEntity->rtti() != RS2::EntityEllipse)
 
-				RS_DIALOGFACTORY->commandMessage(
+				DIALOGFACTORY->commandMessage(
 					tr("Entity must be a line, arc, circle or ellipse."));
 			else
 			{
@@ -108,11 +109,11 @@ void ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
 			cutCoord = snapPoint(e);
 
 			if (cutEntity == NULL)
-				RS_DIALOGFACTORY->commandMessage(tr("No Entity found."));
+				DIALOGFACTORY->commandMessage(tr("No Entity found."));
 			else if (!cutCoord.valid)
-				RS_DIALOGFACTORY->commandMessage(tr("Cutting point is invalid."));
+				DIALOGFACTORY->commandMessage(tr("Cutting point is invalid."));
 			else if (!cutEntity->isPointOnEntity(cutCoord))
-				RS_DIALOGFACTORY->commandMessage(
+				DIALOGFACTORY->commandMessage(
 					tr("Cutting point is not on entity."));
 			else
 			{
@@ -143,17 +144,17 @@ void ActionModifyCut::updateMouseButtonHints()
 	switch (getStatus())
 	{
 	case ChooseCutEntity:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify entity to cut"),
+		DIALOGFACTORY->updateMouseWidget(tr("Specify entity to cut"),
 			tr("Cancel"));
 		break;
 
 	case SetCutCoord:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify cutting point"),
+		DIALOGFACTORY->updateMouseWidget(tr("Specify cutting point"),
 			tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }
@@ -168,12 +169,12 @@ void ActionModifyCut::updateToolBar()
 	switch (getStatus())
 	{
 	case SetCutCoord:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 		break;
 
 	case ChooseCutEntity:
 	default:
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 		break;
 	}
 }