Skip to content

Commit

Permalink
Remove obsolete useCache parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Feb 12, 2015
1 parent 5e1b5a4 commit 90bd24a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions src/server/qgsserverprojectparser.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
return 0; return 0;
} }


addJoinLayersForElement( elem, useCache ); addJoinLayersForElement( elem );
addValueRelationLayersForElement( elem, useCache ); addValueRelationLayersForElement( elem );
addGetFeatureLayers( elem, useCache ); addGetFeatureLayers( elem );


QDomElement dataSourceElem = elem.firstChildElement( "datasource" ); QDomElement dataSourceElem = elem.firstChildElement( "datasource" );
QString uri = dataSourceElem.text(); QString uri = dataSourceElem.text();
Expand Down Expand Up @@ -1369,7 +1369,7 @@ QStringList QgsServerProjectParser::wcsLayers() const
return wcsList; return wcsList;
} }


void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerElem, bool useCache ) const void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerElem ) const
{ {
QDomElement vectorJoinsElem = layerElem.firstChildElement( "vectorjoins" ); QDomElement vectorJoinsElem = layerElem.firstChildElement( "vectorjoins" );
if ( vectorJoinsElem.isNull() ) if ( vectorJoinsElem.isNull() )
Expand All @@ -1386,15 +1386,15 @@ void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerEl
for ( int i = 0; i < joinNodeList.size(); ++i ) for ( int i = 0; i < joinNodeList.size(); ++i )
{ {
QString id = joinNodeList.at( i ).toElement().attribute( "joinLayerId" ); QString id = joinNodeList.at( i ).toElement().attribute( "joinLayerId" );
QgsMapLayer* layer = mapLayerFromLayerId( id, useCache ); QgsMapLayer* layer = mapLayerFromLayerId( id );
if ( layer ) if ( layer )
{ {
QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false ); 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" ); QDomElement editTypesElem = layerElem.firstChildElement( "edittypes" );
if ( editTypesElem.isNull() ) if ( editTypesElem.isNull() )
Expand All @@ -1416,7 +1416,7 @@ void QgsServerProjectParser::addValueRelationLayersForElement( const QDomElement
QString relationAttribute = editTypeElem.attribute( "name" ); QString relationAttribute = editTypeElem.attribute( "name" );
#endif #endif


QgsMapLayer* layer = mapLayerFromLayerId( layerId, useCache ); QgsMapLayer* layer = mapLayerFromLayerId( layerId );
if ( layer ) if ( layer )
{ {
QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false ); QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
Expand All @@ -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; QString str;
QTextStream stream( &str ); QTextStream stream( &str );
Expand Down
6 changes: 3 additions & 3 deletions src/server/qgsserverprojectparser.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ class QgsServerProjectParser
QStringList wfsLayers() const; QStringList wfsLayers() const;
QStringList wcsLayers() 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)'*/ /**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 /**Returns the text of the <id> element for a layer element
@return id or a null string in case of error*/ @return id or a null string in case of error*/
Expand Down

0 comments on commit 90bd24a

Please sign in to comment.