X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fblockdialog.cpp;h=a97acbca92e7b3f0b1e38cfb388bcbbf202d8aa2;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=c5e109050619cf32252183bee652243cab1de016;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/blockdialog.cpp b/src/forms/blockdialog.cpp
index c5e1090..a97acbc 100644
--- a/src/forms/blockdialog.cpp
+++ b/src/forms/blockdialog.cpp
@@ -1,8 +1,11 @@
 // blockdialog.cpp
 //
+// 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>
 //
@@ -13,7 +16,8 @@
 
 #include "blockdialog.h"
 
-#include "rs_blocklist.h"
+#include "blocklist.h"
+#include "debug.h"
 
 BlockDialog::BlockDialog(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags), blockList(NULL)
@@ -25,26 +29,26 @@ BlockDialog::~BlockDialog()
 {
 }
 
-void BlockDialog::setBlockList(RS_BlockList * l)
+void BlockDialog::setBlockList(BlockList * l)
 {
-	RS_DEBUG->print("BlockDialog::setBlockList");
+	DEBUG->print("BlockDialog::setBlockList");
 	blockList = l;
 
 	if (blockList != NULL)
 	{
-		RS_Block * block = blockList->getActive();
+		Block * block = blockList->getActive();
 
 		if (block != NULL)
 			ui.leName->setText(block->getName());
 		else
-			RS_DEBUG->print(RS_Debug::D_ERROR, "BlockDialog::setBlockList: No block active.");
+			DEBUG->print(Debug::D_ERROR, "BlockDialog::setBlockList: No block active.");
 	}
 }
 
-RS_BlockData BlockDialog::getBlockData()
+BlockData BlockDialog::getBlockData()
 {
     /*if (blockList!=NULL) {
-      RS_Block* block = blockList->getActive();
+      Block* block = blockList->getActive();
         if (block!=NULL) {
            return blockList->rename(block, leName->text().latin1());
         }
@@ -52,7 +56,7 @@ RS_BlockData BlockDialog::getBlockData()
 
     return false;*/
 
-	return RS_BlockData(ui.leName->text(), Vector(0.0, 0.0), false);
+	return BlockData(ui.leName->text(), Vector(0.0, 0.0), false);
 }
 
 void BlockDialog::validate()