X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.cpp;h=b5093ceed36a5d899ca325a28969ffbe280762bb;hb=af32602b9d8075080d5805143f1cd47fc10672e1;hp=6398633b6e61706cb555ff97f4db793d4f4325af;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp
index 6398633..b5093ce 100644
--- 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);
 }