Fix build error using cov-build

qgis · Aug 27, 2015 · 6bf5e91 · 6bf5e91
1 parent e94d57e
commit 6bf5e91
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -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
+}
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -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