Some refactoring #7462

qgis · Jul 24, 2018 · 5280ab0 · 5280ab0
1 parent eec843c
commit 5280ab0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
@@ -189,16 +189,11 @@ void QgsProjectLayerGroupDialog::changeProjectFile()
     {
       return;
     }
+  }
 
-    if ( !projectDom.setContent( &projectFile ) )
-    {
-      return;
-    }
-  } else {
-    if ( !projectDom.setContent( &projectFile ) )
-    {
-      return;
-    }    
+  if ( !projectDom.setContent( &projectFile ) )
+  {
+    return;
   }
 
 

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2416,13 +2416,14 @@ namespace QgsWms
     for ( const QgsLayerTreeNode *child : group->children() )
     {
       if ( child->nodeType() == QgsLayerTreeNode::NodeGroup )
-      {
-        QString shortName = child->customProperty( QStringLiteral( "wmsShortName" ) ).toString();
-        QString name = child->name();
-        if ( !shortName.isEmpty() )
-          initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), shortName );
-        else
-          initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), name );
+      {       
+        QString name = child->customProperty( QStringLiteral( "wmsShortName" ) ).toString();
+
+        if ( name.isEmpty() )
+          name = child->name();
+
+        initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), name );
+
       }
     }
   }