Remove unnecessary members from renderer

pblottiere · pblottiere · commit a159c01901e5 · 2019-03-27T15:00:39.000+01:00
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -511,7 +511,7 @@ void QgsWmsRenderContext::checkLayerReadPermissions()
 }
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
-QgsAccessControl *QgsWmsRenderContext::accessControl()
+QgsAccessControl *QgsWmsRenderContext::accessControl() const
 {
   return mInterface->accessControls();
 }
diff --git a/src/server/services/wms/qgswmsrendercontext.h b/src/server/services/wms/qgswmsrendercontext.h
@@ -184,7 +184,7 @@ namespace QgsWms
       /**
        * Returns the access control interface.
        */
-      QgsAccessControl *accessControl();
+      QgsAccessControl *accessControl() const;
 #endif
 
     private:
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -116,10 +116,6 @@ namespace QgsWms
   QgsRenderer::QgsRenderer( const QgsWmsRenderContext &context )
     : mContext( context )
   {
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-    mAccessControl = mContext.accessControl();
-#endif
-
     mProject = mContext.project();
 
     mWmsParameters = mContext.parameters();
@@ -1415,14 +1411,14 @@ namespace QgsWms
     }
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
-    mAccessControl->filterFeatures( layer, fReq );
+    mContext.accessControl()->filterFeatures( layer, fReq );
 
     QStringList attributes;
     for ( const QgsField &field : fields )
     {
       attributes.append( field.name() );
     }
-    attributes = mAccessControl->layerAttributes( layer, attributes );
+    attributes = mContext.accessControl()->layerAttributes( layer, attributes );
     fReq.setSubsetOfAttributes( attributes, layer->fields() );
 #endif
 
@@ -2611,10 +2607,10 @@ namespace QgsWms
       QgsFeatureFilterProviderGroup filters;
       filters.addProvider( &mFeatureFilter );
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
-      mAccessControl->resolveFilterFeatures( mapSettings.layers() );
-      filters.addProvider( mAccessControl );
+      mContext.accessControl()->resolveFilterFeatures( mapSettings.layers() );
+      filters.addProvider( mContext.accessControl() );
 #endif
-      QgsMapRendererJobProxy renderJob( mSettings.parallelRendering(), mSettings.maxThreads(), &filters );
+      QgsMapRendererJobProxy renderJob( mContext.settings().parallelRendering(), mContext.settings().maxThreads(), &filters );
       renderJob.render( mapSettings, &image );
       painter = renderJob.takePainter();
 
@@ -2740,7 +2736,7 @@ namespace QgsWms
   void QgsRenderer::setLayerAccessControlFilter( QgsMapLayer *layer ) const
   {
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
-    QgsOWSServerFilterRestorer::applyAccessControlLayerFilters( mAccessControl, layer );
+    QgsOWSServerFilterRestorer::applyAccessControlLayerFilters( mContext.accessControl(), layer );
 #else
     Q_UNUSED( layer );
 #endif
diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -285,13 +285,8 @@ namespace QgsWms
 
       QgsWmsParameters mWmsParameters;
 
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-      //! The access control helper
-      QgsAccessControl *mAccessControl = nullptr;
-#endif
       QgsFeatureFilter mFeatureFilter;
 
-      QgsServerSettings mSettings;
       const QgsProject *mProject = nullptr;
       QList<QgsMapLayer *> mTemporaryLayers;
       QgsWmsRenderContext mContext;

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ void QgsWmsRenderContext::checkLayerReadPermissions()`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`
`514`		`-QgsAccessControl *QgsWmsRenderContext::accessControl()`
	`514`	`+QgsAccessControl *QgsWmsRenderContext::accessControl() const`
`515`	`515`	`{`
`516`	`516`	`return mInterface->accessControls();`
`517`	`517`	`}`