Skip to content
Permalink
Browse files
indentation update
  • Loading branch information
jef-n committed Jun 27, 2014
1 parent 2d1e983 commit 7e2494ae63d5829c80925e907729ba861083d304
Showing with 9 additions and 9 deletions.
  1. +2 −2 src/app/qgisapp.cpp
  2. +7 −7 src/mapserver/qgswfsserver.cpp
@@ -4820,8 +4820,8 @@ void QgisApp::saveAsLayerDefinition()
if ( path.isEmpty() )
return;

if ( !path.endsWith(".qlr" ) )
path = path.append(".qlr" );
if ( !path.endsWith( ".qlr" ) )
path = path.append( ".qlr" );

QDomDocument doc = QgsMapLayer::asLayerDefinition( layers );
QFile file( path );
@@ -560,7 +560,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
req.setSubsetOfAttributes( attrIndexes );

QgsFeatureIterator fit = layer->getFeatures( req );
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
if ( featureCounter == 0 )
startGetFeature( request, format, layerCrs, &searchRect );
@@ -579,7 +579,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
QVariant res = mFilter->evaluate( &feature, fields );
if ( mFilter->hasEvalError() )
@@ -601,7 +601,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}
else
{
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
if ( featureCounter == 0 )
startGetFeature( request, format, layerCrs, &searchRect );
@@ -877,7 +877,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
throw QgsMapServiceException( "RequestNotWellFormed", QString( "Expression filter error message: %1." ).arg( mFilter->parserErrorString() ) );
}
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
QVariant res = mFilter->evaluate( &feature, fields );
if ( mFilter->hasEvalError() )
@@ -958,7 +958,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
req.setSubsetOfAttributes( attrIndexes );

QgsFeatureIterator fit = layer->getFeatures( req );
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
if ( featureCounter == 0 )
startGetFeature( request, format, layerCrs, &searchRect );
@@ -996,7 +996,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}
req.setSubsetOfAttributes( attrIndexes );
QgsFeatureIterator fit = layer->getFeatures( req );
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
QVariant res = mFilter->evaluate( &feature, fields );
if ( mFilter->hasEvalError() )
@@ -1039,7 +1039,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}
req.setSubsetOfAttributes( attrIndexes );
QgsFeatureIterator fit = layer->getFeatures( req );
while ( fit.nextFeature( feature ) && (maxFeatures == -1 || featureCounter < maxFeat) )
while ( fit.nextFeature( feature ) && ( maxFeatures == -1 || featureCounter < maxFeat ) )
{
mErrors << QString( "The feature %2 of layer for the TypeName '%1'" ).arg( tnStr ).arg( featureCounter );
if ( featureCounter == 0 )

0 comments on commit 7e2494a

Please sign in to comment.