Phase two of adding polyline functionality...

[architektonas] / src / mainapp / qc_dialogfactory.cpp

diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp
index 4e46d6d625d53ab1e3fd765a459a4df22cbd9fb9..a9fe3a6eb61dcd1febae03dd906900ee081785f2 100644 (file)
--- 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>
 //
@@ -15,6 +17,8 @@
 #include "qc_dialogfactory.h"
 
 #include "applicationwindow.h"
+#include "blocklist.h"
+#include "qg_graphicview.h"
 
 QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow)
 {
@@ -27,28 +31,23 @@ 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 != NULL)
+       if (parent && blockList)
        {
-               //RS_BlockList* blist = blockWidget->getBlockList();
-               if (blockList != NULL)
-               {
-                       RS_Block * blk = blockList->getActive();
+               Block * block = blockList->getActive();
 
-                       if (blk != NULL)
-                       {
-                               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);
                }
        }
 }
@@ -56,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 != NULL)
+       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<int(windows.count()); ++i)
+               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 != NULL)
+                       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();
@@ -91,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");
 }