Skip to content

Commit 75896d9

Browse files
committed
QgsExpression takes const QgsFeature as pointer and by reference
1 parent e9e06b9 commit 75896d9

File tree

3 files changed

+142
-134
lines changed

3 files changed

+142
-134
lines changed

python/core/qgsexpression.sip

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ class QgsExpression
2828

2929
//! Evaluate the feature and return the result
3030
//! @note prepare() should be called before calling this method
31-
QVariant evaluate( QgsFeature* f = NULL );
31+
QVariant evaluate( const QgsFeature* f = NULL );
3232

3333
//! Evaluate the feature and return the result
3434
//! @note this method does not expect that prepare() has been called on this instance
35-
QVariant evaluate( QgsFeature* f, const QgsFields& fields );
35+
QVariant evaluate( const QgsFeature* f, const QgsFields& fields );
3636

3737
//! Returns true if an error occurred when evaluating last input
3838
bool hasEvalError() const;
@@ -136,7 +136,7 @@ class QgsExpression
136136
/** The help text for the function. */
137137
QString helptext();
138138

139-
virtual QVariant func(const QVariantList& values, QgsFeature* f, QgsExpression* parent) = 0;
139+
virtual QVariant func(const QVariantList& values, const QgsFeature* f, QgsExpression* parent) = 0;
140140
};
141141

142142
static const QList<QgsExpression::Function *> &Functions();
@@ -185,7 +185,7 @@ class QgsExpression
185185
virtual QgsExpression::NodeType nodeType() const = 0;
186186
// abstract virtual eval function
187187
// errors are reported to the parent
188-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f ) = 0;
188+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f ) = 0;
189189

190190
// abstract virtual preparation function
191191
// errors are reported to the parent
@@ -242,7 +242,7 @@ class QgsExpression
242242

243243
virtual QgsExpression::NodeType nodeType() const;
244244
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
245-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
245+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
246246
virtual QString dump() const;
247247

248248
virtual QStringList referencedColumns() const;
@@ -262,7 +262,7 @@ class QgsExpression
262262

263263
virtual QgsExpression::NodeType nodeType() const;
264264
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
265-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
265+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
266266
virtual QString dump() const;
267267

268268
virtual QStringList referencedColumns() const;
@@ -282,7 +282,7 @@ class QgsExpression
282282

283283
virtual QgsExpression::NodeType nodeType() const;
284284
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
285-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
285+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
286286
virtual QString dump() const;
287287

288288
virtual QStringList referencedColumns() const;
@@ -302,7 +302,7 @@ class QgsExpression
302302

303303
virtual QgsExpression::NodeType nodeType() const;
304304
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
305-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
305+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
306306
virtual QString dump() const;
307307

308308
virtual QStringList referencedColumns() const;
@@ -319,7 +319,7 @@ class QgsExpression
319319

320320
virtual QgsExpression::NodeType nodeType() const;
321321
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
322-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
322+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
323323
virtual QString dump() const;
324324

325325
virtual QStringList referencedColumns() const;
@@ -336,7 +336,7 @@ class QgsExpression
336336

337337
virtual QgsExpression::NodeType nodeType() const;
338338
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
339-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
339+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
340340
virtual QString dump() const;
341341

342342
virtual QStringList referencedColumns() const;
@@ -363,7 +363,7 @@ class QgsExpression
363363
~NodeCondition();
364364

365365
virtual QgsExpression::NodeType nodeType() const;
366-
virtual QVariant eval( QgsExpression* parent, QgsFeature* f );
366+
virtual QVariant eval( QgsExpression* parent, const QgsFeature* f );
367367
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
368368
virtual QString dump() const;
369369

0 commit comments

Comments
 (0)