Phase two of adding polyline functionality...

[architektonas] / src / actions / actionblocksattributes.cpp

diff --git a/src/actions/actionblocksattributes.cpp b/src/actions/actionblocksattributes.cpp
index 81c39806b45f66f7eecbffee8a77b662ec312f13..31a2601309ba4ca89b499ecf6e4d8edf6e40d8bd 100644 (file)
--- a/src/actions/actionblocksattributes.cpp
+++ b/src/actions/actionblocksattributes.cpp
@@ -17,10 +17,10 @@
 #include "actionblocksattributes.h"
 
 #include "drawing.h"
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 
 ActionBlocksAttributes::ActionBlocksAttributes(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Edit Block Attributes", container, graphicView)
 {
 }
@@ -31,17 +31,17 @@ ActionBlocksAttributes::~ActionBlocksAttributes()
 
 void ActionBlocksAttributes::trigger()
 {
-       RS_DEBUG->print("editing block attributes");
+       DEBUG->print("editing block attributes");
 
-       if (graphic && RS_DIALOGFACTORY)
+       if (graphic && DIALOGFACTORY)
        {
-               RS_Block * block = graphic->getActiveBlock();
-               RS_BlockList * blockList = graphic->getBlockList();
+               Block * block = graphic->getActiveBlock();
+               BlockList * blockList = graphic->getBlockList();
 
                if (blockList && block)
                {
                        QString oldName = block->getName();
-                       RS_BlockData d = RS_DIALOGFACTORY->requestBlockAttributesDialog(blockList);
+                       BlockData d = DIALOGFACTORY->requestBlockAttributesDialog(blockList);
 
                        if (d.isValid())
                        {