Phase two of adding polyline functionality...

[architektonas] / src / actions / actionblocksattributes.cpp

diff --git a/src/actions/actionblocksattributes.cpp b/src/actions/actionblocksattributes.cpp
index 7e6d09d881c0273542b40abb4542a0c9f16bc6b6..31a2601309ba4ca89b499ecf6e4d8edf6e40d8bd 100644 (file)
--- a/src/actions/actionblocksattributes.cpp
+++ b/src/actions/actionblocksattributes.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -15,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)
 {
 }
@@ -29,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())
                        {