QgsExpression: some const fixes

m-kuhn · m-kuhn · commit a92d1a6e312e · 2014-11-30T10:34:19.000+01:00
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -24,10 +24,10 @@ class QgsExpression
      * all attributes from the layer are required for evaluation of the expression.
      * QgsFeatureRequest::setSubsetOfAttributes automatically handles this case.
      */
-    QStringList referencedColumns();
+    QStringList referencedColumns() const;
 
     //! Returns true if the expression uses feature geometry for some computation
-    bool needsGeometry();
+    bool needsGeometry() const;
 
     // evaluation
 
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1891,7 +1891,7 @@ QgsExpression::~QgsExpression()
   delete mRootNode;
 }
 
-QStringList QgsExpression::referencedColumns()
+QStringList QgsExpression::referencedColumns() const
 {
   if ( !mRootNode )
     return QStringList();
@@ -1915,7 +1915,7 @@ QStringList QgsExpression::referencedColumns()
   return columns;
 }
 
-bool QgsExpression::needsGeometry()
+bool QgsExpression::needsGeometry() const
 {
   if ( !mRootNode )
     return false;
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -103,15 +103,16 @@ class CORE_EXPORT QgsExpression
     //! Get the expression ready for evaluation - find out column indexes.
     bool prepare( const QgsFields &fields );
 
-    /**Get list of columns referenced by the expression.
+    /**
+     * Get list of columns referenced by the expression.
      * @note if the returned list contains the QgsFeatureRequest::AllAttributes constant then
      * all attributes from the layer are required for evaluation of the expression.
      * QgsFeatureRequest::setSubsetOfAttributes automatically handles this case.
      */
-    QStringList referencedColumns();
+    QStringList referencedColumns() const;
 
     //! Returns true if the expression uses feature geometry for some computation
-    bool needsGeometry();
+    bool needsGeometry() const;
 
     // evaluation
 

Original file line number	Diff line number	Diff line change
`@@ -1891,7 +1891,7 @@ QgsExpression::~QgsExpression()`
`1891`	`1891`	`delete mRootNode;`
`1892`	`1892`	`}`
`1893`	`1893`
`1894`		`-QStringList QgsExpression::referencedColumns()`
	`1894`	`+QStringList QgsExpression::referencedColumns() const`
`1895`	`1895`	`{`
`1896`	`1896`	`if ( !mRootNode )`
`1897`	`1897`	`return QStringList();`
`@@ -1915,7 +1915,7 @@ QStringList QgsExpression::referencedColumns()`
`1915`	`1915`	`return columns;`
`1916`	`1916`	`}`
`1917`	`1917`
`1918`		`-bool QgsExpression::needsGeometry()`
	`1918`	`+bool QgsExpression::needsGeometry() const`
`1919`	`1919`	`{`
`1920`	`1920`	`if ( !mRootNode )`
`1921`	`1921`	`return false;`