In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / widgets / qg_dialogfactory.cpp

diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp
index b0a9248535322c4d68ee2b421b380acb50768d84..f1f7bbdcc53e99c5e9c9750384f453141aae4a9b 100644 (file)
--- a/src/widgets/qg_dialogfactory.cpp
+++ b/src/widgets/qg_dialogfactory.cpp
@@ -109,7 +109,7 @@ QG_DialogFactory::QG_DialogFactory(QWidget * parent, QToolBar * ow):
        selectionWidget = NULL;
        cadToolBar = NULL;
        commandWidget = NULL;
-       mainWindow = NULL;
+       mainWindowIntf = NULL;
        DEBUG->print("QG_DialogFactory::QG_DialogFactory: OK");
 }
 
@@ -192,9 +192,9 @@ CommandWidget * QG_DialogFactory::getCommandWidget()
 /**
  * Links the dialog factory to a main app window.
  */
-/*virtual*/ void QG_DialogFactory::setMainWindow(QG_MainWindowInterface * mw)
+/*virtual*/ void QG_DialogFactory::setMainWindow(QG_MainWindowInterface * mwi)
 {
-       mainWindow = mw;
+       mainWindowIntf = mwi;
 }
 
 /**
@@ -211,10 +211,10 @@ void QG_DialogFactory::requestWarningDialog(const QString & warning)
  */
 GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, Document * doc)
 {
-       if (mainWindow != NULL)
+       if (mainWindowIntf != NULL)
        {
-               mainWindow->createNewDocument(fileName, doc);
-               return mainWindow->getGraphicView();
+               mainWindowIntf->createNewDocument(fileName, doc);
+               return mainWindowIntf->getGraphicView();
        }
 
        return NULL;
@@ -225,9 +225,9 @@ GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, Doc
  */
 void QG_DialogFactory::requestSimulationControls()
 {
-       if (mainWindow != NULL)
+       if (mainWindowIntf != NULL)
        {
-               mainWindow->showSimulationControls();
+               mainWindowIntf->showSimulationControls();
        }
 }
 
@@ -288,7 +288,7 @@ Layer * QG_DialogFactory::requestLayerRemovalDialog(LayerList * layerList)
     }
     /*
        if (layerList==NULL) {
-           if (container!=NULL && container->rtti()==RS2::EntityGraphic) {
+           if (container!=NULL && container->rtti()==RS2::EntityDrawing) {
                layerList = (LayerList*)container;
            } else {
                return NULL;
@@ -406,9 +406,8 @@ BlockData QG_DialogFactory::requestNewBlockDialog(BlockList * blockList)
  */
 BlockData QG_DialogFactory::requestBlockAttributesDialog(BlockList * blockList)
 {
-       //Block* block = NULL;
-       BlockData ret;
-       ret = BlockData("", Vector(false), false);
+       BlockData ret("", Vector(false), false);
+//     ret = BlockData("", Vector(false), false);
 
        if (blockList == NULL)
        {
@@ -416,17 +415,6 @@ BlockData QG_DialogFactory::requestBlockAttributesDialog(BlockList * blockList)
                        "blockList is NULL");
                return ret;
        }
-       /*
-               if (blockList==NULL) {
-                       if (container!=NULL && container->rtti()==RS2::EntityGraphic) {
-                               blockList = (BlockList*)container;
-                       } else {
-                               return NULL;
-                       }
-               }*/
-
-       // Block for parameter livery
-       //block = blockList->getActive();
 
        BlockDialog dlg(parent);//WAS:, "Rename Block");
 #warning "!!! WTF !!! WHY DO WE HAVE TO PREFIX tr WITH QObject:: ???"
@@ -435,13 +423,8 @@ BlockData QG_DialogFactory::requestBlockAttributesDialog(BlockList * blockList)
 
        if (dlg.exec())
        {
-               //dlg.updateBlock();
-               //block->setData();
                ret = dlg.getBlockData();
        }
-       //else {
-       //      ret = BlockData("", Vector(false));
-       //}
 
        return ret;
 }