Some refactoring #7462

tcoupin · tcoupin · commit 5280ab033a6b · 2018-07-24T21:21:07.000+02:00
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 );
+        
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -189,16 +189,11 @@ void QgsProjectLayerGroupDialog::changeProjectFile()`
`189`	`189`	`{`
`190`	`190`	`return;`
`191`	`191`	`}`
	`192`	`+ }`
`192`	`193`
`193`		`- if ( !projectDom.setContent( &projectFile ) )`
`194`		`- {`
`195`		`- return;`
`196`		`- }`
`197`		`- } else {`
`198`		`- if ( !projectDom.setContent( &projectFile ) )`
`199`		`- {`
`200`		`- return;`
`201`		`- }`
	`194`	`+ if ( !projectDom.setContent( &projectFile ) )`
	`195`	`+ {`
	`196`	`+ return;`
`202`	`197`	`}`
`203`	`198`
`204`	`199`
Original file line number	Diff line number	Diff line change
`@@ -2416,13 +2416,14 @@ namespace QgsWms`
`2416`	`2416`	`for ( const QgsLayerTreeNode *child : group->children() )`
`2417`	`2417`	`{`
`2418`	`2418`	`if ( child->nodeType() == QgsLayerTreeNode::NodeGroup )`
`2419`		`- {`
`2420`		`- QString shortName = child->customProperty( QStringLiteral( "wmsShortName" ) ).toString();`
`2421`		`- QString name = child->name();`
`2422`		`- if ( !shortName.isEmpty() )`
`2423`		`- initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), shortName );`
`2424`		`- else`
`2425`		`- initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), name );`
	`2419`	`+ {`
	`2420`	`+ QString name = child->customProperty( QStringLiteral( "wmsShortName" ) ).toString();`
	`2421`	`+`
	`2422`	`+ if ( name.isEmpty() )`
	`2423`	`+ name = child->name();`
	`2424`	`+`
	`2425`	`+ initLayerGroupsRecursive( static_cast<const QgsLayerTreeGroup *>( child ), name );`
	`2426`	`+`
`2426`	`2427`	`}`
`2427`	`2428`	`}`
`2428`	`2429`	`}`