Correctly parse styles for layer in groups

elpaso · elpaso · commit 6e85a893ea7b · 2018-11-06T14:57:34.000+01:00
diff --git a/src/core/layertree/qgslayertreeutils.cpp b/src/core/layertree/qgslayertreeutils.cpp
@@ -311,7 +311,8 @@ void QgsLayerTreeUtils::storeOriginalLayersProperties( QgsLayerTreeGroup *group,
   const QDomNodeList mlNodeList( doc->documentElement()
                                  .firstChildElement( QStringLiteral( "projectlayers" ) )
                                  .elementsByTagName( QStringLiteral( "maplayer" ) ) );
-  for ( QgsLayerTreeNode *node : group->children() )
+
+  std::function<void ( QgsLayerTreeNode * )> _store = [ & ]( QgsLayerTreeNode * node )
   {
     if ( QgsLayerTree::isLayer( node ) )
     {
@@ -337,6 +338,19 @@ void QgsLayerTreeUtils::storeOriginalLayersProperties( QgsLayerTreeGroup *group,
         }
       }
     }
+    else if ( QgsLayerTree::isGroup( node ) )
+    {
+      const QList<QgsLayerTreeNode *> constChildren( node->children( ) );
+      for ( const auto &childNode : constChildren )
+      {
+        _store( childNode );
+      }
+    }
+  };
+
+  for ( QgsLayerTreeNode *node : group->children() )
+  {
+    _store( node );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,8 @@ void QgsLayerTreeUtils::storeOriginalLayersProperties( QgsLayerTreeGroup *group,`
`311`	`311`	`const QDomNodeList mlNodeList( doc->documentElement()`
`312`	`312`	`.firstChildElement( QStringLiteral( "projectlayers" ) )`
`313`	`313`	`.elementsByTagName( QStringLiteral( "maplayer" ) ) );`
`314`		`- for ( QgsLayerTreeNode *node : group->children() )`
	`314`	`+`
	`315`	`+ std::function<void ( QgsLayerTreeNode * )> _store = [ & ]( QgsLayerTreeNode * node )`
`315`	`316`	`{`
`316`	`317`	`if ( QgsLayerTree::isLayer( node ) )`
`317`	`318`	`{`
`@@ -337,6 +338,19 @@ void QgsLayerTreeUtils::storeOriginalLayersProperties( QgsLayerTreeGroup *group,`
`337`	`338`	`}`
`338`	`339`	`}`
`339`	`340`	`}`
	`341`	`+ else if ( QgsLayerTree::isGroup( node ) )`
	`342`	`+ {`
	`343`	`+ const QList<QgsLayerTreeNode *> constChildren( node->children( ) );`
	`344`	`+ for ( const auto &childNode : constChildren )`
	`345`	`+ {`
	`346`	`+ _store( childNode );`
	`347`	`+ }`
	`348`	`+ }`
	`349`	`+ };`
	`350`	`+`
	`351`	`+ for ( QgsLayerTreeNode *node : group->children() )`
	`352`	`+ {`
	`353`	`+ _store( node );`
`340`	`354`	`}`
`341`	`355`	`}`
`342`	`356`