Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fully qualify nested classes for vintage sip
  • Loading branch information
m-kuhn committed May 1, 2017
1 parent 7a4527d commit b9ec373
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/core/qgsexpression.sip
Expand Up @@ -669,7 +669,7 @@ The help text for the function.

protected:

static bool allParamsStatic( const NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context );
static bool allParamsStatic( const QgsExpression::NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context );
%Docstring
This will return true if all the params for the provided function ``node`` are static within the
constraints imposed by the ``context`` within the given ``parent``.
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsexpression.h
Expand Up @@ -661,7 +661,7 @@ class CORE_EXPORT QgsExpression
*
* \note Added in QGIS 3.0
*/
static bool allParamsStatic( const NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context );
static bool allParamsStatic( const QgsExpression::NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context );

private:
QString mName;
Expand Down Expand Up @@ -782,9 +782,9 @@ class CORE_EXPORT QgsExpression

virtual QSet<QString> referencedColumns( const QgsExpression::NodeFunction *node ) const override;

virtual bool isStatic( const NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const override;
virtual bool isStatic( const QgsExpression::NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const override;

virtual bool prepare( const NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const override;
virtual bool prepare( const QgsExpression::NodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const override;

/**
* Set a function that will be called in the prepare step to determine if the function is
Expand Down

0 comments on commit b9ec373

Please sign in to comment.