Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionblocksremove.cpp

diff --git a/src/actions/actionblocksremove.cpp b/src/actions/actionblocksremove.cpp
index 1eaf12bfec6e3c00da8eb366ca07d3742777e4ff..180b8ef96442ac98d50d207b9f3c1fbe0dfbaa7f 100644 (file)
--- a/src/actions/actionblocksremove.cpp
+++ b/src/actions/actionblocksremove.cpp
@@ -22,7 +22,7 @@
 #include "graphicview.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)