Const correctness

pblottiere · pblottiere · commit bae996c8ad44 · 2018-09-13T08:04:34.000+01:00
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -3093,7 +3093,7 @@ QDomElement QgsOgcUtilsSQLStatementToFilter::toOgcFilter( const QgsSQLStatement:
   return QDomElement();
 }
 
-QgsOgcUtilsExpressionFromFilter::QgsOgcUtilsExpressionFromFilter( const QgsOgcUtils::FilterVersion version, QgsVectorLayer *layer )
+QgsOgcUtilsExpressionFromFilter::QgsOgcUtilsExpressionFromFilter( const QgsOgcUtils::FilterVersion version, const QgsVectorLayer *layer )
   : mLayer( layer )
 {
   mPropertyName = QStringLiteral( "PropertyName" );
@@ -3263,7 +3263,7 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodeBinaryOper
 QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeSpatialOperatorFromOgcFilter( const QDomElement &element )
 {
   // we are exploiting the fact that our function names are the same as the XML tag names
-  int opIdx = QgsExpression::functionIndex( element.tagName().toLower() );
+  const int opIdx = QgsExpression::functionIndex( element.tagName().toLower() );
 
   std::unique_ptr<QgsExpressionNode::NodeList> gml2Args( new QgsExpressionNode::NodeList() );
   QDomElement childElem = element.firstChildElement();
@@ -3324,7 +3324,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co
     if ( childNode.nodeType() == QDomNode::ElementNode )
     {
       // found a element node (e.g. PropertyName), convert it
-      QDomElement operandElem = childNode.toElement();
+      const QDomElement operandElem = childNode.toElement();
       operand.reset( nodeFromOgcFilter( operandElem ) );
       if ( !operand )
       {
@@ -3349,7 +3349,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co
         }
         if ( !propertyNameElement.isNull() || propertyNameElement.tagName() == mPropertyName )
         {
-          int fieldIndex = mLayer->fields().indexOf( propertyNameElement.firstChild().nodeValue() );
+          const int fieldIndex = mLayer->fields().indexOf( propertyNameElement.firstChild().nodeValue() );
           if ( fieldIndex != -1 )
           {
             QgsField field = mLayer->fields().field( propertyNameElement.firstChild().nodeValue() );
@@ -3363,7 +3363,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co
         // try to convert the node content to number if possible,
         // otherwise let's use it as string
         bool ok;
-        double d = value.toDouble( &ok );
+        const double d = value.toDouble( &ok );
         if ( ok )
           value = d;
       }
@@ -3397,7 +3397,7 @@ QgsExpressionNodeUnaryOperator *QgsOgcUtilsExpressionFromFilter::nodeNotFromOgcF
   if ( element.tagName() != QLatin1String( "Not" ) )
     return nullptr;
 
-  QDomElement operandElem = element.firstChildElement();
+  const QDomElement operandElem = element.firstChildElement();
   std::unique_ptr<QgsExpressionNode> operand( nodeFromOgcFilter( operandElem ) );
   if ( !operand )
   {
@@ -3416,7 +3416,7 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIs
     return nullptr;
   }
 
-  QDomElement operandElem = element.firstChildElement();
+  const QDomElement operandElem = element.firstChildElement();
   std::unique_ptr<QgsExpressionNode> opLeft( nodeFromOgcFilter( operandElem ) );
   if ( !opLeft )
     return nullptr;
@@ -3435,7 +3435,7 @@ QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeFunctionFromOgcF
 
   for ( int i = 0; i < QgsExpression::Functions().size(); i++ )
   {
-    QgsExpressionFunction *funcDef = QgsExpression::Functions()[i];
+    const QgsExpressionFunction *funcDef = QgsExpression::Functions()[i];
 
     if ( element.attribute( QStringLiteral( "name" ) ) != funcDef->name() )
       continue;
diff --git a/src/core/qgsogcutils.h b/src/core/qgsogcutils.h
@@ -392,7 +392,7 @@ class QgsOgcUtilsExpressionFromFilter
      * \param layer Layer to use to retrieve field values from literal filters
      */
     QgsOgcUtilsExpressionFromFilter( QgsOgcUtils::FilterVersion version = QgsOgcUtils::FILTER_OGC_1_0,
-                                     QgsVectorLayer *layer = nullptr );
+                                     const QgsVectorLayer *layer = nullptr );
 
     /**
      * Returns an expression node from a WFS filter embedded in a document
@@ -457,7 +457,7 @@ class QgsOgcUtilsExpressionFromFilter
     QgsExpressionNode *nodeIsBetweenFromOgcFilter( const QDomElement &element );
 
   private:
-    QgsVectorLayer *mLayer = nullptr;
+    const QgsVectorLayer *mLayer = nullptr;
     QString mErrorMessage;
     QString mPropertyName;
     QString mPrefix;

Original file line number	Diff line number	Diff line change
`@@ -3093,7 +3093,7 @@ QDomElement QgsOgcUtilsSQLStatementToFilter::toOgcFilter( const QgsSQLStatement:`
`3093`	`3093`	`return QDomElement();`
`3094`	`3094`	`}`
`3095`	`3095`
`3096`		`-QgsOgcUtilsExpressionFromFilter::QgsOgcUtilsExpressionFromFilter( const QgsOgcUtils::FilterVersion version, QgsVectorLayer *layer )`
	`3096`	`+QgsOgcUtilsExpressionFromFilter::QgsOgcUtilsExpressionFromFilter( const QgsOgcUtils::FilterVersion version, const QgsVectorLayer *layer )`
`3097`	`3097`	`: mLayer( layer )`
`3098`	`3098`	`{`
`3099`	`3099`	`mPropertyName = QStringLiteral( "PropertyName" );`
`@@ -3263,7 +3263,7 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodeBinaryOper`
`3263`	`3263`	`QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeSpatialOperatorFromOgcFilter( const QDomElement &element )`
`3264`	`3264`	`{`
`3265`	`3265`	`// we are exploiting the fact that our function names are the same as the XML tag names`
`3266`		`- int opIdx = QgsExpression::functionIndex( element.tagName().toLower() );`
	`3266`	`+ const int opIdx = QgsExpression::functionIndex( element.tagName().toLower() );`
`3267`	`3267`
`3268`	`3268`	`std::unique_ptr<QgsExpressionNode::NodeList> gml2Args( new QgsExpressionNode::NodeList() );`
`3269`	`3269`	`QDomElement childElem = element.firstChildElement();`
`@@ -3324,7 +3324,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co`
`3324`	`3324`	`if ( childNode.nodeType() == QDomNode::ElementNode )`
`3325`	`3325`	`{`
`3326`	`3326`	`// found a element node (e.g. PropertyName), convert it`
`3327`		`- QDomElement operandElem = childNode.toElement();`
	`3327`	`+ const QDomElement operandElem = childNode.toElement();`
`3328`	`3328`	`operand.reset( nodeFromOgcFilter( operandElem ) );`
`3329`	`3329`	`if ( !operand )`
`3330`	`3330`	`{`
`@@ -3349,7 +3349,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co`
`3349`	`3349`	`}`
`3350`	`3350`	`if ( !propertyNameElement.isNull() \|\| propertyNameElement.tagName() == mPropertyName )`
`3351`	`3351`	`{`
`3352`		`- int fieldIndex = mLayer->fields().indexOf( propertyNameElement.firstChild().nodeValue() );`
	`3352`	`+ const int fieldIndex = mLayer->fields().indexOf( propertyNameElement.firstChild().nodeValue() );`
`3353`	`3353`	`if ( fieldIndex != -1 )`
`3354`	`3354`	`{`
`3355`	`3355`	`QgsField field = mLayer->fields().field( propertyNameElement.firstChild().nodeValue() );`
`@@ -3363,7 +3363,7 @@ QgsExpressionNode *QgsOgcUtilsExpressionFromFilter::nodeLiteralFromOgcFilter( co`
`3363`	`3363`	`// try to convert the node content to number if possible,`
`3364`	`3364`	`// otherwise let's use it as string`
`3365`	`3365`	`bool ok;`
`3366`		`- double d = value.toDouble( &ok );`
	`3366`	`+ const double d = value.toDouble( &ok );`
`3367`	`3367`	`if ( ok )`
`3368`	`3368`	`value = d;`
`3369`	`3369`	`}`
`@@ -3397,7 +3397,7 @@ QgsExpressionNodeUnaryOperator *QgsOgcUtilsExpressionFromFilter::nodeNotFromOgcF`
`3397`	`3397`	`if ( element.tagName() != QLatin1String( "Not" ) )`
`3398`	`3398`	`return nullptr;`
`3399`	`3399`
`3400`		`- QDomElement operandElem = element.firstChildElement();`
	`3400`	`+ const QDomElement operandElem = element.firstChildElement();`
`3401`	`3401`	`std::unique_ptr<QgsExpressionNode> operand( nodeFromOgcFilter( operandElem ) );`
`3402`	`3402`	`if ( !operand )`
`3403`	`3403`	`{`
`@@ -3416,7 +3416,7 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIs`
`3416`	`3416`	`return nullptr;`
`3417`	`3417`	`}`
`3418`	`3418`
`3419`		`- QDomElement operandElem = element.firstChildElement();`
	`3419`	`+ const QDomElement operandElem = element.firstChildElement();`
`3420`	`3420`	`std::unique_ptr<QgsExpressionNode> opLeft( nodeFromOgcFilter( operandElem ) );`
`3421`	`3421`	`if ( !opLeft )`
`3422`	`3422`	`return nullptr;`
`@@ -3435,7 +3435,7 @@ QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeFunctionFromOgcF`
`3435`	`3435`
`3436`	`3436`	`for ( int i = 0; i < QgsExpression::Functions().size(); i++ )`
`3437`	`3437`	`{`
`3438`		`- QgsExpressionFunction *funcDef = QgsExpression::Functions()[i];`
	`3438`	`+ const QgsExpressionFunction *funcDef = QgsExpression::Functions()[i];`
`3439`	`3439`
`3440`	`3440`	`if ( element.attribute( QStringLiteral( "name" ) ) != funcDef->name() )`
`3441`	`3441`	`continue;`