In the middle of major refactoring...

[architektonas] / src / mainapp / qc_dialogfactory.cpp

diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp
index 4e46d6d625d53ab1e3fd765a459a4df22cbd9fb9..d7f6eeb95dd0b22727d1f78d9fa1791993451dec 100644 (file)
--- a/src/mainapp/qc_dialogfactory.cpp
+++ b/src/mainapp/qc_dialogfactory.cpp
@@ -15,6 +15,7 @@
 #include "qc_dialogfactory.h"
 
 #include "applicationwindow.h"
+#include "qg_graphicview.h"
 
 QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow)
 {
@@ -34,21 +35,16 @@ void QC_DialogFactory::requestEditBlockWindow(RS_BlockList * blockList)
        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)
-                       {
-                               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);
                }
        }
 }
@@ -63,18 +59,18 @@ void QC_DialogFactory::closeEditBlockWindow(RS_Block * block)
        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);
                        MDIWindow * m = (MDIWindow *)windows.at(i);
 
-                       if (m != NULL)
+                       if (m)
                        {
                                RS_DEBUG->print("QC_DialogFactory::closeEditBlockWindow: got mdi");