X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fqc_dialogfactory.cpp;h=f34ad8b507d06ae647429ae616991247b510023c;hb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;hp=414d31d012653d1978af83b05e802d98496e77ed;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp
index 414d31d..f34ad8b 100644
--- a/src/mainapp/qc_dialogfactory.cpp
+++ b/src/mainapp/qc_dialogfactory.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>
 //
@@ -14,9 +16,10 @@
 
 #include "qc_dialogfactory.h"
 
-#include "qc_applicationwindow.h"
+#include "applicationwindow.h"
+#include "qg_graphicview.h"
 
-QC_DialogFactory::QC_DialogFactory(QWidget * parent, QWidget * ow): QG_DialogFactory(parent, ow)
+QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow)
 {
 }
 
@@ -31,24 +34,19 @@ void QC_DialogFactory::requestEditBlockWindow(RS_BlockList * blockList)
 {
 	RS_DEBUG->print("QC_DialogFactory::requestEditBlockWindow()");
 
-	QC_ApplicationWindow * appWindow = QC_ApplicationWindow::getAppWindow();
-	QC_MDIWindow * parent = appWindow->getMDIWindow();
+	ApplicationWindow * appWindow = ApplicationWindow::getAppWindow();
+	MDIWindow * parent = appWindow->getMDIWindow();
 
-	if (parent != NULL)
+	if (parent && blockList)
 	{
-		//RS_BlockList* blist = blockWidget->getBlockList();
-		if (blockList != NULL)
-		{
-			RS_Block * blk = blockList->getActive();
+		RS_Block * block = blockList->getActive();
 
-			if (blk != NULL)
-			{
-				QC_MDIWindow * w = appWindow->slotFileNew(blk);
-				// the parent needs a pointer to the block window and
-				//   vice versa
-				parent->addChildWindow(w);
-				w->getGraphicView()->zoomAuto(false);
-			}
+		if (block)
+		{
+			MDIWindow * w = appWindow->slotFileNew(block);
+			// the parent needs a pointer to the block window and vice versa
+			parent->addChildWindow(w);
+			w->getGraphicView()->zoomAuto(false);
 		}
 	}
 }
@@ -60,21 +58,21 @@ void QC_DialogFactory::closeEditBlockWindow(RS_Block * block)
 {
 	RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow");
 
-	QC_ApplicationWindow * appWindow = QC_ApplicationWindow::getAppWindow();
+	ApplicationWindow * appWindow = ApplicationWindow::getAppWindow();
 	QMdiArea * workspace = appWindow->getWorkspace();
 
-	if (workspace != NULL)
+	if (workspace)
 	{
 		RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: workspace found");
 
 		QList<QMdiSubWindow *> windows = workspace->subWindowList();
 
-		for(int i=0; i<int(windows.count()); ++i)
+		for(int i=0; i<windows.count(); i++)
 		{
 			RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: window: %d", i);
-			QC_MDIWindow * m = (QC_MDIWindow *)windows.at(i);
+			MDIWindow * m = (MDIWindow *)windows.at(i);
 
-			if (m != NULL)
+			if (m)
 			{
 				RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: got mdi");