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

diff --git a/src/actions/actionblocksremove.cpp b/src/actions/actionblocksremove.cpp
index b6720fc..180b8ef 100644
--- a/src/actions/actionblocksremove.cpp
+++ b/src/actions/actionblocksremove.cpp
@@ -16,13 +16,13 @@
 
 #include "actionblocksremove.h"
 
-#include "rs_block.h"
-#include "rs_dialogfactory.h"
+#include "block.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 #include "graphicview.h"
-#include "rs_insert.h"
+#include "insert.h"
 
-ActionBlocksRemove::ActionBlocksRemove(RS_EntityContainer & container, GraphicView & graphicView):
+ActionBlocksRemove::ActionBlocksRemove(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Remove Block", container, graphicView)
 {
 }
@@ -33,16 +33,16 @@ ActionBlocksRemove::~ActionBlocksRemove()
 
 void ActionBlocksRemove::trigger()
 {
-	RS_DEBUG->print("ActionBlocksRemove::trigger");
+	DEBUG->print("ActionBlocksRemove::trigger");
 
 	if (graphic)
 	{
-		RS_Block * block = RS_DIALOGFACTORY->requestBlockRemovalDialog(graphic->getBlockList());
+		Block * block = DIALOGFACTORY->requestBlockRemovalDialog(graphic->getBlockList());
 
 		// list of containers that might refer to the block via inserts:
-		QList<RS_EntityContainer *> containerList;
+		QList<EntityContainer *> containerList;
 		containerList.append(graphic);
-		RS_BlockList * blkLst = graphic->getBlockList();
+		BlockList * blkLst = graphic->getBlockList();
 
 		for(uint bi=0; bi<blkLst->count(); bi++)
 			containerList.append(blkLst->at(bi));
@@ -51,7 +51,7 @@ void ActionBlocksRemove::trigger()
 		{
 			for(int i=0; i<containerList.size(); i++)
 			{
-				RS_EntityContainer * cont = containerList[i];
+				EntityContainer * cont = containerList[i];
 				// remove all inserts from the graphic:
 				bool done;
 
@@ -59,12 +59,12 @@ void ActionBlocksRemove::trigger()
 				{
 					done = true;
 
-					for(RS_Entity * e=cont->firstEntity(RS2::ResolveNone); e!=NULL;
+					for(Entity * e=cont->firstEntity(RS2::ResolveNone); e!=NULL;
 					     e=cont->nextEntity(RS2::ResolveNone))
 					{
 						if (e->rtti() == RS2::EntityInsert)
 						{
-							RS_Insert * ins = (RS_Insert *)e;
+							Insert * ins = (Insert *)e;
 
 							if (ins->getName() == block->getName())
 							{
@@ -79,8 +79,8 @@ void ActionBlocksRemove::trigger()
 			}
 
 			// close all windows that are editing this block:
-			if (RS_DIALOGFACTORY)
-				RS_DIALOGFACTORY->closeEditBlockWindow(block);
+			if (DIALOGFACTORY)
+				DIALOGFACTORY->closeEditBlockWindow(block);
 
 			// Now remove the block from the block list:
 			graphic->removeBlock(block);
@@ -90,7 +90,7 @@ void ActionBlocksRemove::trigger()
 	}
 
 	finish();
-	RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+	DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionBlocksRemove::init(int status)