sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build error using cov-build

Browse Source
This commit is contained in:
Nyall Dawson 2015-08-28 08:46:22 +10:00
parent e94d57e255
commit 6bf5e912b0
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/qgsexpression.cpp
View File

@ -2240,6 +2240,13 @@ QVariant QgsExpression::evaluate( const QgsFeature* f )
return mRootNode->eval( this, &context );
}
QVariant QgsExpression::evaluate( const QgsFeature &f )
{
Q_NOWARN_DEPRECATED_PUSH
return evaluate( &f );
Q_NOWARN_DEPRECATED_POP
}
QVariant QgsExpression::evaluate( const QgsFeature* f, const QgsFields& fields )
{
// first prepare
@ -3272,3 +3279,10 @@ bool QgsExpression::Node::prepare( QgsExpression* parent, const QgsExpressionCon
return prepare( parent, f );
Q_NOWARN_DEPRECATED_POP
}
QVariant QgsExpression::StaticFunction::func( const QVariantList &values, const QgsFeature* f, QgsExpression* parent )
{
Q_NOWARN_DEPRECATED_PUSH
return mFnc( values, f, parent );
Q_NOWARN_DEPRECATED_POP
}

11
src/core/qgsexpression.h
View File

@ -130,7 +130,7 @@ class CORE_EXPORT QgsExpression
//! Evaluate the feature and return the result
//! @note prepare() should be called before calling this method
//! @note available in python bindings as evaluatePrepared
Q_DECL_DEPRECATED inline QVariant evaluate( const QgsFeature& f ) { Q_NOWARN_DEPRECATED_PUSH return evaluate( &f ); Q_NOWARN_DEPRECATED_POP }
Q_DECL_DEPRECATED QVariant evaluate( const QgsFeature& f );
//! Evaluate the feature and return the result
//! @note this method does not expect that prepare() has been called on this instance
@ -139,7 +139,7 @@ class CORE_EXPORT QgsExpression
//! Evaluate the feature and return the result
//! @note this method does not expect that prepare() has been called on this instance
//! @note not available in python bindings
Q_DECL_DEPRECATED inline QVariant evaluate( const QgsFeature& f, const QgsFields& fields );
Q_DECL_DEPRECATED QVariant evaluate( const QgsFeature& f, const QgsFields& fields );
/** Evaluate the feature and return the result.
* @note this method does not expect that prepare() has been called on this instance
@ -458,12 +458,7 @@ class CORE_EXPORT QgsExpression
, mContextFnc( fcn )
, mAliases( aliases )
{}
Q_DECL_DEPRECATED virtual QVariant func( const QVariantList& values, const QgsFeature* f, QgsExpression* parent ) override
{
Q_NOWARN_DEPRECATED_PUSH
return mFnc( values, f, parent );
Q_NOWARN_DEPRECATED_POP
}
Q_DECL_DEPRECATED virtual QVariant func( const QVariantList& values, const QgsFeature* f, QgsExpression* parent ) override;
/** Returns result of evaluating the function.
* @param values list of values passed to the function