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

diff --git a/src/actions/actionblocksadd.cpp b/src/actions/actionblocksadd.cpp
index c187c0e..f2f9e8f 100644
--- a/src/actions/actionblocksadd.cpp
+++ b/src/actions/actionblocksadd.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 "actionblocksadd.h"
 
 #include "drawing.h"
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 
-ActionBlocksAdd::ActionBlocksAdd(RS_EntityContainer & container, GraphicView & graphicView):
+ActionBlocksAdd::ActionBlocksAdd(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Add Block", container, graphicView)
 {
 }
@@ -28,18 +30,18 @@ ActionBlocksAdd::~ActionBlocksAdd()
 
 void ActionBlocksAdd::trigger()
 {
-	RS_DEBUG->print("adding block");
+	DEBUG->print("adding block");
 
 	if (graphic)
 	{
-		RS_BlockList * blockList = graphic->getBlockList();
+		BlockList * blockList = graphic->getBlockList();
 
 		if (blockList)
 		{
-			RS_BlockData d = RS_DIALOGFACTORY->requestNewBlockDialog(blockList);
+			BlockData d = DIALOGFACTORY->requestNewBlockDialog(blockList);
 
 			if (d.isValid())
-				graphic->addBlock(new RS_Block(container, d));
+				graphic->addBlock(new Block(container, d));
 		}
 	}