X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionblocksedit.cpp;h=6776e02133f0ab68fafa3148dd1ac2f97cf807aa;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=548e4ced22a717577c0ba1002a65cd310a933b19;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/actions/actionblocksedit.cpp b/src/actions/actionblocksedit.cpp
index 548e4ce..6776e02 100644
--- a/src/actions/actionblocksedit.cpp
+++ b/src/actions/actionblocksedit.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,9 +17,9 @@
 #include "actionblocksedit.h"
 
 #include "drawing.h"
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 
-ActionBlocksEdit::ActionBlocksEdit(RS_EntityContainer & container, GraphicView & graphicView):
+ActionBlocksEdit::ActionBlocksEdit(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Edit Block", container, graphicView)
 {
 }
@@ -28,12 +30,12 @@ ActionBlocksEdit::~ActionBlocksEdit()
 
 void ActionBlocksEdit::trigger()
 {
-	RS_DEBUG->print("edit block");
+	DEBUG->print("edit block");
 
-	if (graphic && RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestEditBlockWindow(graphic->getBlockList());
+	if (graphic && DIALOGFACTORY)
+		DIALOGFACTORY->requestEditBlockWindow(graphic->getBlockList());
 	else
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ActionBlocksEdit::trigger(): graphic is NULL");
+		DEBUG->print(Debug::D_WARNING, "ActionBlocksEdit::trigger(): graphic is NULL");
 
 	finish();
 }