X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fqc_dialogfactory.cpp;h=a9fe3a6eb61dcd1febae03dd906900ee081785f2;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=2f81da97a83b5fa8ff6e1b9ca319af17dadc0005;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp
index 2f81da9..a9fe3a6 100644
--- a/src/mainapp/qc_dialogfactory.cpp
+++ b/src/mainapp/qc_dialogfactory.cpp
@@ -17,7 +17,7 @@
 #include "qc_dialogfactory.h"
 
 #include "applicationwindow.h"
-#include "rs_blocklist.h"
+#include "blocklist.h"
 #include "qg_graphicview.h"
 
 QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow)
@@ -31,16 +31,16 @@ QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFa
 /**
  * Provides a new window for editing the active block.
  */
-void QC_DialogFactory::requestEditBlockWindow(RS_BlockList * blockList)
+void QC_DialogFactory::requestEditBlockWindow(BlockList * blockList)
 {
-	RS_DEBUG->print("QC_DialogFactory::requestEditBlockWindow()");
+	DEBUG->print("QC_DialogFactory::requestEditBlockWindow()");
 
 	ApplicationWindow * appWindow = ApplicationWindow::getAppWindow();
 	MDIWindow * parent = appWindow->getMDIWindow();
 
 	if (parent && blockList)
 	{
-		RS_Block * block = blockList->getActive();
+		Block * block = blockList->getActive();
 
 		if (block)
 		{
@@ -55,31 +55,31 @@ void QC_DialogFactory::requestEditBlockWindow(RS_BlockList * blockList)
 /**
  * Closes all windows that are editing the given block.
  */
-void QC_DialogFactory::closeEditBlockWindow(RS_Block * block)
+void QC_DialogFactory::closeEditBlockWindow(Block * block)
 {
-	RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow");
+	DEBUG->print("QC_DialogFactory::closeEditBlockWindow");
 
 	ApplicationWindow * appWindow = ApplicationWindow::getAppWindow();
 	QMdiArea * workspace = appWindow->getWorkspace();
 
 	if (workspace)
 	{
-		RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: workspace found");
+		DEBUG->print("QC_DialogFactory::closeEditBlockWindow: workspace found");
 
 		QList<QMdiSubWindow *> windows = workspace->subWindowList();
 
 		for(int i=0; i<windows.count(); i++)
 		{
-			RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: window: %d", i);
+			DEBUG->print("QC_DialogFactory::closeEditBlockWindow: window: %d", i);
 			MDIWindow * m = (MDIWindow *)windows.at(i);
 
 			if (m)
 			{
-				RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: got mdi");
+				DEBUG->print("QC_DialogFactory::closeEditBlockWindow: got mdi");
 
 				if (m->getDocument() == block)
 				{
-					RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: closing mdi");
+					DEBUG->print("QC_DialogFactory::closeEditBlockWindow: closing mdi");
 					//m->closeMDI(true, false);
 //					m->close(true);
 					m->close();
@@ -90,5 +90,5 @@ void QC_DialogFactory::closeEditBlockWindow(RS_Block * block)
 
 	appWindow->slotWindowActivated(NULL);
 
-	RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: OK");
+	DEBUG->print("QC_DialogFactory::closeEditBlockWindow: OK");
 }