Remove obsolete useCache parameters

qgis · Feb 12, 2015 · 90bd24a · 90bd24a
1 parent 5e1b5a4
commit 90bd24a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -150,9 +150,9 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
     return 0;
   }
 
-  addJoinLayersForElement( elem, useCache );
-  addValueRelationLayersForElement( elem, useCache );
-  addGetFeatureLayers( elem, useCache );
+  addJoinLayersForElement( elem );
+  addValueRelationLayersForElement( elem );
+  addGetFeatureLayers( elem );
 
   QDomElement dataSourceElem = elem.firstChildElement( "datasource" );
   QString uri = dataSourceElem.text();
@@ -1369,7 +1369,7 @@ QStringList QgsServerProjectParser::wcsLayers() const
   return wcsList;
 }
 
-void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerElem, bool useCache ) const
+void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerElem ) const
 {
   QDomElement vectorJoinsElem = layerElem.firstChildElement( "vectorjoins" );
   if ( vectorJoinsElem.isNull() )
@@ -1386,15 +1386,15 @@ void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerEl
   for ( int i = 0; i < joinNodeList.size(); ++i )
   {
     QString id = joinNodeList.at( i ).toElement().attribute( "joinLayerId" );
-    QgsMapLayer* layer = mapLayerFromLayerId( id, useCache );
+    QgsMapLayer* layer = mapLayerFromLayerId( id );
     if ( layer )
     {
       QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
     }
   }
 }
 
-void QgsServerProjectParser::addValueRelationLayersForElement( const QDomElement& layerElem, bool useCache ) const
+void QgsServerProjectParser::addValueRelationLayersForElement( const QDomElement& layerElem ) const
 {
   QDomElement editTypesElem = layerElem.firstChildElement( "edittypes" );
   if ( editTypesElem.isNull() )
@@ -1416,7 +1416,7 @@ void QgsServerProjectParser::addValueRelationLayersForElement( const QDomElement
       QString relationAttribute = editTypeElem.attribute( "name" );
 #endif
 
-      QgsMapLayer* layer = mapLayerFromLayerId( layerId, useCache );
+      QgsMapLayer* layer = mapLayerFromLayerId( layerId );
       if ( layer )
       {
         QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
@@ -1425,7 +1425,7 @@ void QgsServerProjectParser::addValueRelationLayersForElement( const QDomElement
   }
 }
 
-void QgsServerProjectParser::addGetFeatureLayers( const QDomElement& layerElem, bool useCache ) const
+void QgsServerProjectParser::addGetFeatureLayers( const QDomElement& layerElem ) const
 {
   QString str;
   QTextStream stream( &str );

diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h
@@ -110,11 +110,11 @@ class QgsServerProjectParser
     QStringList wfsLayers() const;
     QStringList wcsLayers() const;
 
-    void addJoinLayersForElement( const QDomElement& layerElem, bool useCache = true ) const;
+    void addJoinLayersForElement( const QDomElement& layerElem ) const;
 
-    void addValueRelationLayersForElement( const QDomElement& layerElem, bool useCache = true ) const;
+    void addValueRelationLayersForElement( const QDomElement& layerElem ) const;
     /**Add layers which are necessary for the evaluation of the expression function 'getFeature( layer, attributField, value)'*/
-    void addGetFeatureLayers( const QDomElement& layerElem, bool useCache = true ) const;
+    void addGetFeatureLayers( const QDomElement& layerElem ) const;
 
     /**Returns the text of the <id> element for a layer element
     @return id or a null string in case of error*/