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

diff --git a/src/actions/actionmodifydelete.cpp b/src/actions/actionmodifydelete.cpp
index a416798..9e9ee6d 100644
--- a/src/actions/actionmodifydelete.cpp
+++ b/src/actions/actionmodifydelete.cpp
@@ -16,11 +16,12 @@
 
 #include "actionmodifydelete.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_modification.h"
+#include "modification.h"
 
-ActionModifyDelete::ActionModifyDelete(RS_EntityContainer & container,
+ActionModifyDelete::ActionModifyDelete(EntityContainer & container,
 	GraphicView & graphicView): ActionInterface("Delete Entities",
 		container, graphicView)
 {
@@ -38,27 +39,27 @@ void ActionModifyDelete::init(int status)
 
 void ActionModifyDelete::trigger()
 {
-	RS_DEBUG->print("ActionModifyDelete::trigger()");
-	RS_Modification m(*container, graphicView);
+	DEBUG->print("ActionModifyDelete::trigger()");
+	Modification m(*container, graphicView);
 	m.remove();
 	finish();
 
-	if (RS_DIALOGFACTORY != NULL)
-		RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+	if (DIALOGFACTORY != NULL)
+		DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyDelete::updateMouseButtonHints()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		switch (getStatus())
 		{
 		//case Acknowledge:
-		//    RS_DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"),
+		//    DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"),
 		//	tr("Cancel"));
 		//    break;
 		default:
-			RS_DIALOGFACTORY->updateMouseWidget("", "");
+			DIALOGFACTORY->updateMouseWidget("", "");
 			break;
 		}
 	}
@@ -71,11 +72,11 @@ void ActionModifyDelete::updateMouseCursor()
 
 void ActionModifyDelete::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		if (!isFinished())
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 		else
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
 	}
 }