Fully qualify nested classes for vintage sip

m-kuhn · m-kuhn · commit b9ec373f4cd9 · 2017-05-02T01:54:58.000+02:00
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -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``.
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -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;
@@ -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
