Skip to content
Permalink
Browse files

Some refactoring #7462

  • Loading branch information
tcoupin committed Jul 24, 2018
1 parent eec843c commit 5280ab033a6b17481705abaa4b00ddc836a4d56e
Showing with 12 additions and 16 deletions.
  1. +4 −9 src/app/qgsprojectlayergroupdialog.cpp
  2. +8 −7 src/server/services/wms/qgswmsrenderer.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;
}


@@ -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 );

}
}
}

0 comments on commit 5280ab0

Please sign in to comment.
You can’t perform that action at this time.