Update API

qgis · May 13, 2020 · 306065e · 306065e
1 parent 60d87e7
commit 306065e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -68,14 +68,17 @@ void QgsLegendRenderer::drawLegend( QPainter *painter )
   paintAndDetermineSize( context );
 }
 
-void QgsLegendRenderer::exportLegendToJson( const QgsRenderContext &context, QJsonObject &json )
+QJsonObject QgsLegendRenderer::exportLegendToJson( const QgsRenderContext &context )
 {
+  QJsonObject json;
+
   QgsLayerTreeGroup *rootGroup = mLegendModel->rootGroup();
   if ( !rootGroup )
-    return;
+    return json;
 
   json[QStringLiteral( "title" )] = mSettings.title();
   exportLegendToJson( context, rootGroup, json );
+  return json;
 }
 
 void QgsLegendRenderer::exportLegendToJson( const QgsRenderContext &context, QgsLayerTreeGroup *nodeGroup, QJsonObject &json )

diff --git a/src/core/qgslegendrenderer.h b/src/core/qgslegendrenderer.h
@@ -100,7 +100,7 @@ class CORE_EXPORT QgsLegendRenderer
      *
      * \since QGIS 3.8
      */
-    void exportLegendToJson( const QgsRenderContext &context, QJsonObject &json );
+    QJsonObject exportLegendToJson( const QgsRenderContext &context );
 
     /**
      * Sets the \a style of a \a node.

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -194,11 +194,8 @@ namespace QgsWms
     QgsLegendRenderer renderer( &model, settings );
 
     // rendering
-    QJsonObject json;
     QgsRenderContext renderContext;
-    renderer.exportLegendToJson( renderContext, json );
-
-    return json;
+    return renderer.exportLegendToJson( renderContext );
   }
 
   void QgsRenderer::runHitTest( const QgsMapSettings &mapSettings, HitTest &hitTest ) const