[Server] Remove QgsProject::instance

rldhont · rldhont · commit d8cf02e0836c · 2017-09-19T07:34:34.000+02:00
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -305,7 +305,6 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res
 {
   QgsMessageLog::MessageLevel logLevel = QgsServerLogger::instance()->logLevel();
   QTime time; //used for measuring request time if loglevel < 1
-  QgsProject::instance()->removeAllMapLayers();
 
   qApp->processEvents();
 
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1686,20 +1686,6 @@ namespace QgsWms
     return true;
   }
 
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-  void QgsRenderer::applyAccessControlLayersFilters( const QStringList &layerList, QHash<QgsMapLayer *, QString> &originalLayerFilters ) const
-  {
-    Q_FOREACH ( const QString &layerName, layerList )
-    {
-      QList<QgsMapLayer *> mapLayers = QgsProject::instance()->mapLayersByName( layerName );
-      Q_FOREACH ( QgsMapLayer *mapLayer, mapLayers )
-      {
-        QgsOWSServerFilterRestorer::applyAccessControlLayerFilters( mAccessControl, mapLayer, originalLayerFilters );
-      }
-    }
-  }
-#endif
-
   bool QgsRenderer::testFilterStringSafety( const QString &filter ) const
   {
     //; too dangerous for sql injections
@@ -1897,7 +1883,7 @@ namespace QgsWms
         QString currentLayerId = currentLayerElem.attribute( QStringLiteral( "id" ) );
         if ( !currentLayerId.isEmpty() )
         {
-          QgsMapLayer *currentLayer = QgsProject::instance()->mapLayer( currentLayerId );
+          QgsMapLayer *currentLayer = mProject->mapLayer( currentLayerId );
           if ( currentLayer )
           {
             QString WMSPropertyAttributesString = currentLayer->customProperty( QStringLiteral( "WMSPropertyAttributes" ) ).toString();
@@ -2109,7 +2095,7 @@ namespace QgsWms
 
     QgsExpressionContext expressionContext;
     expressionContext << QgsExpressionContextUtils::globalScope()
-                      << QgsExpressionContextUtils::projectScope( QgsProject::instance() );
+                      << QgsExpressionContextUtils::projectScope( mProject );
     if ( layer )
       expressionContext << QgsExpressionContextUtils::layerScope( layer );
     expressionContext.setFeature( *feat );
diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -224,15 +224,6 @@ namespace QgsWms
       //! Record which symbols within one layer would be rendered with the given renderer context
       void runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, QgsRenderContext &context ) const;
 
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-
-      /** Apply filter strings from the access control to the layers.
-       * \param layerList layers to filter
-       * \param originalLayerFilters the original layers filter dictionary
-       */
-      void applyAccessControlLayersFilters( const QStringList &layerList, QHash<QgsMapLayer *, QString> &originalLayerFilters ) const;
-#endif
-
       /** Tests if a filter sql string is allowed (safe)
         \returns true in case of success, false if string seems unsafe*/
       bool testFilterStringSafety( const QString &filter ) const;

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,6 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res`
`305`	`305`	`{`
`306`	`306`	`QgsMessageLog::MessageLevel logLevel = QgsServerLogger::instance()->logLevel();`
`307`	`307`	`QTime time; //used for measuring request time if loglevel < 1`
`308`		`- QgsProject::instance()->removeAllMapLayers();`
`309`	`308`
`310`	`309`	`qApp->processEvents();`
`311`	`310`