[Server] Replace list.size() < 1 by list.isEmpty()

rldhont · rldhont · commit fc63cbecc4aa · 2017-06-05T16:55:56.000+02:00
diff --git a/src/server/qgsinterpolationlayerbuilder.cpp b/src/server/qgsinterpolationlayerbuilder.cpp
@@ -52,7 +52,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el
   }
 
   QDomNodeList interpolationList = elem.elementsByTagName( QStringLiteral( "Interpolation" ) );
-  if ( interpolationList.size() < 1 )
+  if ( interpolationList.isEmpty() )
   {
     QgsDebugMsg( "No Interpolation element found" );
     return nullptr;
@@ -68,7 +68,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el
   QgsInterpolator::LayerData currentLayerData;
   currentLayerData.vectorLayer = mVectorLayer;
   QDomNodeList propertyNameList = interpolationElem.elementsByTagName( QStringLiteral( "PropertyName" ) );
-  if ( propertyNameList.size() < 1 )
+  if ( propertyNameList.isEmpty() )
   {
     currentLayerData.zCoordInterpolation = true;
   }
@@ -110,7 +110,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el
   int nCols, nRows;
 
   QDomNodeList resolutionNodeList = elem.elementsByTagName( QStringLiteral( "Resolution" ) );
-  if ( resolutionNodeList.size() < 1 )
+  if ( resolutionNodeList.isEmpty() )
   {
     //use default values...
     nCols = 100;
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -124,7 +124,7 @@ QFileInfo QgsServer::defaultProjectFile()
   {
     QgsMessageLog::logMessage( projectFiles.at( x ).absoluteFilePath(), QStringLiteral( "Server" ), QgsMessageLog::INFO );
   }
-  if ( projectFiles.size() < 1 )
+  if ( projectFiles.isEmpty() )
   {
     return QFileInfo();
   }
diff --git a/src/server/services/wms/qgswmsdescribelayer.cpp b/src/server/services/wms/qgswmsdescribelayer.cpp
@@ -59,7 +59,7 @@ namespace QgsWms
     }
 
     QStringList layersList = parameters[ QStringLiteral( "LAYERS" )].split( ',', QString::SkipEmptyParts );
-    if ( layersList.size() < 1 )
+    if ( layersList.isEmpty() )
     {
       throw QgsServiceException( QStringLiteral( "InvalidParameterValue" ), QStringLiteral( "Layers is empty" ), 400 );
     }
diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.cpp b/src/server/services/wms/qgswmsgetfeatureinfo.cpp
@@ -74,7 +74,7 @@ namespace QgsWms
         QDomNodeList featureNodeList = layerElem.elementsByTagName( QStringLiteral( "Feature" ) );
         QDomElement currentFeatureElement;
 
-        if ( featureNodeList.size() < 1 ) //raster layer?
+        if ( featureNodeList.isEmpty() ) //raster layer?
         {
           QDomNodeList attributeNodeList = layerElem.elementsByTagName( QStringLiteral( "Attribute" ) );
           for ( int j = 0; j < attributeNodeList.size(); ++j )
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -173,7 +173,7 @@ namespace QgsWms
 
     readLayersAndStyles( mParameters, layersList, stylesList );
 
-    if ( layersList.size() < 1 )
+    if ( layersList.isEmpty() )
     {
       return nullptr;
     }
@@ -193,7 +193,7 @@ namespace QgsWms
 
     QgsCoordinateReferenceSystem dummyCRS;
     QStringList layerIds = layerSet( layersList, stylesList, dummyCRS, scaleDenominator );
-    if ( layerIds.size() < 1 )
+    if ( layerIds.isEmpty() )
     {
       return nullptr;
     }
@@ -966,7 +966,7 @@ namespace QgsWms
     }
 
     QStringList queryLayerList = mParameters[ QStringLiteral( "QUERY_LAYERS" )].split( QStringLiteral( "," ), QString::SkipEmptyParts );
-    if ( queryLayerList.size() < 1 )
+    if ( queryLayerList.isEmpty() )
     {
       throw QgsBadRequestException( QStringLiteral( "InvalidParameterValue" ), QStringLiteral( "Malformed QUERY_LAYERS" ) );
     }
@@ -2386,7 +2386,7 @@ namespace QgsWms
       QDomElement currentFeatureElem;
 
       QDomNodeList featureList = currentLayerElem.elementsByTagName( QStringLiteral( "Feature" ) );
-      if ( featureList.size() < 1 )
+      if ( featureList.isEmpty() )
       {
         //raster?
         QDomNodeList attributeList = currentLayerElem.elementsByTagName( QStringLiteral( "Attribute" ) );

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`QDomNodeList interpolationList = elem.elementsByTagName( QStringLiteral( "Interpolation" ) );`
`55`		`- if ( interpolationList.size() < 1 )`
	`55`	`+ if ( interpolationList.isEmpty() )`
`56`	`56`	`{`
`57`	`57`	`QgsDebugMsg( "No Interpolation element found" );`
`58`	`58`	`return nullptr;`
`@@ -68,7 +68,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el`
`68`	`68`	`QgsInterpolator::LayerData currentLayerData;`
`69`	`69`	`currentLayerData.vectorLayer = mVectorLayer;`
`70`	`70`	`QDomNodeList propertyNameList = interpolationElem.elementsByTagName( QStringLiteral( "PropertyName" ) );`
`71`		`- if ( propertyNameList.size() < 1 )`
	`71`	`+ if ( propertyNameList.isEmpty() )`
`72`	`72`	`{`
`73`	`73`	`currentLayerData.zCoordInterpolation = true;`
`74`	`74`	`}`
`@@ -110,7 +110,7 @@ QgsMapLayer *QgsInterpolationLayerBuilder::createMapLayer( const QDomElement &el`
`110`	`110`	`int nCols, nRows;`
`111`	`111`
`112`	`112`	`QDomNodeList resolutionNodeList = elem.elementsByTagName( QStringLiteral( "Resolution" ) );`
`113`		`- if ( resolutionNodeList.size() < 1 )`
	`113`	`+ if ( resolutionNodeList.isEmpty() )`
`114`	`114`	`{`
`115`	`115`	`//use default values...`
`116`	`116`	`nCols = 100;`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ QFileInfo QgsServer::defaultProjectFile()`
`124`	`124`	`{`
`125`	`125`	`QgsMessageLog::logMessage( projectFiles.at( x ).absoluteFilePath(), QStringLiteral( "Server" ), QgsMessageLog::INFO );`
`126`	`126`	`}`
`127`		`- if ( projectFiles.size() < 1 )`
	`127`	`+ if ( projectFiles.isEmpty() )`
`128`	`128`	`{`
`129`	`129`	`return QFileInfo();`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ namespace QgsWms`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`QStringList layersList = parameters[ QStringLiteral( "LAYERS" )].split( ',', QString::SkipEmptyParts );`
`62`		`- if ( layersList.size() < 1 )`
	`62`	`+ if ( layersList.isEmpty() )`
`63`	`63`	`{`
`64`	`64`	`throw QgsServiceException( QStringLiteral( "InvalidParameterValue" ), QStringLiteral( "Layers is empty" ), 400 );`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ namespace QgsWms`
`74`	`74`	`QDomNodeList featureNodeList = layerElem.elementsByTagName( QStringLiteral( "Feature" ) );`
`75`	`75`	`QDomElement currentFeatureElement;`
`76`	`76`
`77`		`- if ( featureNodeList.size() < 1 ) //raster layer?`
	`77`	`+ if ( featureNodeList.isEmpty() ) //raster layer?`
`78`	`78`	`{`
`79`	`79`	`QDomNodeList attributeNodeList = layerElem.elementsByTagName( QStringLiteral( "Attribute" ) );`
`80`	`80`	`for ( int j = 0; j < attributeNodeList.size(); ++j )`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ namespace QgsWms`
`173`	`173`
`174`	`174`	`readLayersAndStyles( mParameters, layersList, stylesList );`
`175`	`175`
`176`		`- if ( layersList.size() < 1 )`
	`176`	`+ if ( layersList.isEmpty() )`
`177`	`177`	`{`
`178`	`178`	`return nullptr;`
`179`	`179`	`}`
`@@ -193,7 +193,7 @@ namespace QgsWms`
`193`	`193`
`194`	`194`	`QgsCoordinateReferenceSystem dummyCRS;`
`195`	`195`	`QStringList layerIds = layerSet( layersList, stylesList, dummyCRS, scaleDenominator );`
`196`		`- if ( layerIds.size() < 1 )`
	`196`	`+ if ( layerIds.isEmpty() )`
`197`	`197`	`{`
`198`	`198`	`return nullptr;`
`199`	`199`	`}`
`@@ -966,7 +966,7 @@ namespace QgsWms`
`966`	`966`	`}`
`967`	`967`
`968`	`968`	`QStringList queryLayerList = mParameters[ QStringLiteral( "QUERY_LAYERS" )].split( QStringLiteral( "," ), QString::SkipEmptyParts );`
`969`		`- if ( queryLayerList.size() < 1 )`
	`969`	`+ if ( queryLayerList.isEmpty() )`
`970`	`970`	`{`
`971`	`971`	`throw QgsBadRequestException( QStringLiteral( "InvalidParameterValue" ), QStringLiteral( "Malformed QUERY_LAYERS" ) );`
`972`	`972`	`}`
`@@ -2386,7 +2386,7 @@ namespace QgsWms`
`2386`	`2386`	`QDomElement currentFeatureElem;`
`2387`	`2387`
`2388`	`2388`	`QDomNodeList featureList = currentLayerElem.elementsByTagName( QStringLiteral( "Feature" ) );`
`2389`		`- if ( featureList.size() < 1 )`
	`2389`	`+ if ( featureList.isEmpty() )`
`2390`	`2390`	`{`
`2391`	`2391`	`//raster?`
`2392`	`2392`	`QDomNodeList attributeList = currentLayerElem.elementsByTagName( QStringLiteral( "Attribute" ) );`