Update sip files

python/core/expression/qgsexpression.sip

@@ -108,13 +108,6 @@ Implicit sharing was added in 2.14
     ~QgsExpression();
 
     bool operator==( const QgsExpression &other ) const;
-%Docstring
- Compares two expressions. The operator returns true
- if the expression string is equal.
-
-.. versionadded:: 3.0
- :rtype: bool
-%End
 
     bool isValid() const;
 %Docstring

python/core/expression/qgsexpressionfunction.sip

@@ -64,9 +64,6 @@ Returns the default value for the parameter.
 %End
 
         bool operator==( const QgsExpressionFunction::Parameter &other ) const;
-%Docstring
- :rtype: bool
-%End
 
     };
 
@@ -253,9 +250,6 @@ The help text for the function.
 %End
 
     bool operator==( const QgsExpressionFunction &other ) const;
-%Docstring
- :rtype: bool
-%End
 
     virtual bool handlesNull() const;
 %Docstring

python/core/expression/qgsexpressionnode.sip

@@ -87,7 +87,11 @@ Node
     };
 
     class NodeList
-    {
+{
+
+%TypeHeaderCode
+#include "qgsexpressionnode.h"
+%End
       public:
         virtual ~NodeList();
         void append( QgsExpressionNode *node /Transfer/ );

python/core/qgsfeaturerequest.sip

@@ -208,23 +208,24 @@ class QgsFeatureRequest
 %End
       public:
 
-        OrderBy();
+        CORE_EXPORT OrderBy();
 %Docstring
  Create a new empty order by
+ :rtype: CORE_EXPORT
 %End
 
-        OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
+        CORE_EXPORT OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
 %Docstring
  Create a new order by from a list of clauses
+ :rtype: CORE_EXPORT
 %End
 
-        QList<QgsFeatureRequest::OrderByClause> list() const;
+        QList<QgsFeatureRequest::OrderByClause> CORE_EXPORT list() const;
 %Docstring
  Get a copy as a list of OrderByClauses
 
  This is only required in Python where the inheritance
  is not properly propagated and this makes it usable.
- :rtype: list of QgsFeatureRequest.OrderByClause
 %End
 
         void  save( QDomElement &elem ) const;
@@ -240,13 +241,11 @@ class QgsFeatureRequest
         QSet<QString>  usedAttributes() const;
 %Docstring
  Returns a set of used attributes
- :rtype: set of str
 %End
 
         QString  dump() const;
 %Docstring
  Dumps the content to an SQL equivalent syntax
- :rtype: str
 %End
     };
 

python/gui/qgsvertexmarker.sip

@@ -0,0 +1,93 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsvertexmarker.h                                            *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsVertexMarker : QgsMapCanvasItem
+{
+%Docstring
+ A class for marking vertices of features using e.g. circles or 'x'.
+%End
+
+%TypeHeaderCode
+#include "qgsvertexmarker.h"
+%End
+  public:
+
+    enum IconType
+    {
+      ICON_NONE,
+      ICON_CROSS,
+      ICON_X,
+      ICON_BOX,
+      ICON_CIRCLE
+    };
+
+    QgsVertexMarker( QgsMapCanvas *mapCanvas /TransferThis/ );
+
+    void setCenter( const QgsPoint &point );
+
+    void setIconType( int iconType );
+
+    void setIconSize( int iconSize );
+
+    void setColor( const QColor &color );
+%Docstring
+ Sets the stroke ``color`` for the marker.
+.. seealso:: color()
+.. seealso:: setFillColor()
+%End
+
+    QColor color() const;
+%Docstring
+ Returns the stroke color for the marker.
+.. seealso:: setColor()
+.. seealso:: fillColor()
+.. versionadded:: 3.0
+ :rtype: QColor
+%End
+
+    void setFillColor( const QColor &color );
+%Docstring
+ Sets the fill ``color`` for the marker. This setting only
+ applies to some icon types.
+.. versionadded:: 3.0
+.. seealso:: fillColor()
+.. seealso:: setColor()
+%End
+
+    QColor fillColor() const;
+%Docstring
+ Returns the fill ``color`` for the marker. This setting only
+ applies to some icon types.
+.. versionadded:: 3.0
+.. seealso:: setFillColor()
+.. seealso:: color()
+ :rtype: QColor
+%End
+
+    void setPenWidth( int width );
+
+    virtual void paint( QPainter *p );
+
+
+    virtual QRectF boundingRect() const;
+
+
+    virtual void updatePosition();
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsvertexmarker.h                                            *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

src/core/expression/qgsexpressionnode.h

@@ -106,7 +106,7 @@ class CORE_EXPORT QgsExpressionNode SIP_ABSTRACT
 
     /** \ingroup core
      */
-    class NodeList
+    class CORE_EXPORT NodeList
     {
       public:
         virtual ~NodeList();