Skip to content
Permalink
Browse files

Remove obsolete useCache parameters

  • Loading branch information
mhugent committed Feb 12, 2015
1 parent 5e1b5a4 commit 90bd24a33b28fbae48f3df6a70e22917ed835075
Showing with 11 additions and 11 deletions.
  1. +8 −8 src/server/qgsserverprojectparser.cpp
  2. +3 −3 src/server/qgsserverprojectparser.h
@@ -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 );
@@ -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*/

0 comments on commit 90bd24a

Please sign in to comment.
You can’t perform that action at this time.