Sipify core.QgsFeatureFilterProvider

qgis · May 3, 2017 · 05933b1 · 05933b1
1 parent 3be20f8
commit 05933b1
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 18 deletions.
diff --git a/python/auto_sip.blacklist b/python/auto_sip.blacklist
@@ -9,7 +9,6 @@ core/qgseditorwidgetsetup.sip
 core/qgserror.sip
 core/qgsexpressioncontext.sip
 core/qgsexpressioncontextgenerator.sip
-core/qgsfeaturefilterprovider.sip
 core/qgsfeatureiterator.sip
 core/qgsfeaturerequest.sip
 core/qgsgeometrysimplifier.sip

diff --git a/python/core/qgsfeaturefilterprovider.sip b/python/core/qgsfeaturefilterprovider.sip
@@ -1,27 +1,54 @@
-/** \ingroup core
- * \class QgsFeatureFilterProvider
- * Abstract interface for use by classes that filter the features of a layer.
- * A QgsFeatureFilterProvider provides a method for modifying a QgsFeatureRequest in place to apply
- * additional filters to the request.
- * \note added in QGIS 2.14
- **/
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeaturefilterprovider.h                                  *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+
+
+
 class QgsFeatureFilterProvider
 {
-%TypeHeaderCode
-#include <qgsfeaturefilterprovider.h>
+%Docstring
+ Abstract interface for use by classes that filter the features of a layer.
+ A QgsFeatureFilterProvider provides a method for modifying a QgsFeatureRequest in place to apply
+ additional filters to the request.
+.. versionadded:: 2.14
+*
 %End
 
+%TypeHeaderCode
+#include "qgsfeaturefilterprovider.h"
+%End
   public:
 
-    /** Add additional filters to the feature request to further restrict the features returned by the request.
-     * Derived classes must implement this method.
-     * @param layer the layer to filter
-     * @param featureRequest the feature request to update
-     */
+
     virtual void filterFeatures( const QgsVectorLayer *layer, QgsFeatureRequest &featureRequest ) const = 0;
+%Docstring
+ Add additional filters to the feature request to further restrict the features returned by the request.
+ Derived classes must implement this method.
+ \param layer the layer to filter
+ \param featureRequest the feature request to update
+%End
 
-    /** Create a clone of the feature filter provider
-     * @return a new clone
-     */
     virtual QgsFeatureFilterProvider *clone() const = 0 /Factory/;
+%Docstring
+ Create a clone of the feature filter provider
+ :return: a new clone
+ :rtype: QgsFeatureFilterProvider
+%End
 };
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeaturefilterprovider.h                                  *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/src/core/qgsfeaturefilterprovider.h b/src/core/qgsfeaturefilterprovider.h
@@ -40,11 +40,15 @@ class CORE_EXPORT QgsFeatureFilterProvider
 {
   public:
 
+#ifndef SIP_RUN
+
     //! Constructor
     QgsFeatureFilterProvider() {}
 
     virtual ~QgsFeatureFilterProvider() = default;
 
+#endif
+
     /** Add additional filters to the feature request to further restrict the features returned by the request.
      * Derived classes must implement this method.
      * \param layer the layer to filter