Fixed Library Browser...

[architektonas] / src / widgets / qg_dialogfactory.cpp

diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp
index 6398633b6e61706cb555ff97f4db793d4f4325af..b5093ceed36a5d899ca325a28969ffbe280762bb 100644 (file)
--- a/src/widgets/qg_dialogfactory.cpp
+++ b/src/widgets/qg_dialogfactory.cpp
@@ -339,17 +339,8 @@ RS_Layer * QG_DialogFactory::requestEditLayerDialog(RS_LayerList * layerList)
 {
        RS_DEBUG->print("QG_DialogFactory::requestEditLayerDialog");
        RS_Layer * layer = NULL;
-       /*
-       if (layerList==NULL) {
-               if (container!=NULL && container->rtti()==RS2::EntityGraphic) {
-                       layerList = (RS_LayerList*)container;
-               } else {
-                       return NULL;
-               }
-       }
-       */
 
-       if (layerList == NULL)
+       if (!layerList)
        {
                RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestEditLayerDialog(): "
                        "layerList is NULL");
@@ -357,7 +348,7 @@ RS_Layer * QG_DialogFactory::requestEditLayerDialog(RS_LayerList * layerList)
        }
 
        // Layer for parameter livery
-       if (layerList->getActive() != NULL)
+       if (layerList->getActive())
        {
                layer = new RS_Layer(*layerList->getActive());
 
@@ -1408,7 +1399,7 @@ void QG_DialogFactory::requestLibraryInsertOptions(ActionInterface * action, boo
  */
 void QG_DialogFactory::requestToolBar(RS2::ToolBarId id)
 {
-       if (cadToolBar != NULL)
+       if (cadToolBar)
                cadToolBar->showToolBar(id);
 }