fix multine removal for SIP_PYARGREOMVEq

qgis · Dec 19, 2018 · c20b5b2 · c20b5b2
1 parent 32e844f
commit c20b5b2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in
@@ -1586,13 +1586,13 @@ empty if none of the child geometries match the desired type.
 %Docstring
 Modifies geometry to avoid intersections with the layers specified in project properties
 
+:param avoidIntersectionsLayers: list of layers to check for intersections
+
 :return: 0 in case of success,
          1 if geometry is not of polygon type,
          2 if avoid intersection would change the geometry type,
          3 other error during intersection removal
 
-:param avoidIntersectionsLayers: list of layers to check for intersections
-
 .. versionadded:: 1.5
 %End
 

diff --git a/python/core/auto_generated/qgsmaplayerstore.sip.in b/python/core/auto_generated/qgsmaplayerstore.sip.in
@@ -119,8 +119,6 @@ to the store.
 The layersAdded() and layerWasAdded() signals will always be emitted.
 
 :param layers: A list of layer which should be added to the store.
-                      If you specify false here you have take care of deleting
-                      the layers yourself. Not available in Python.
 
 :return: a list of the map layers that were added
          successfully. If a layer already exists in the store,
@@ -141,8 +139,6 @@ If you are adding multiple layers at once, you should use
 addMapLayers() instead.
 
 :param layer: A layer to add to the store
-                      If you specify false here you have take care of deleting
-                      the layers yourself. Not available in Python.
 
 :return: None if unable to add layer, otherwise pointer to newly added layer
 

diff --git a/python/core/auto_generated/qgspallabeling.sip.in b/python/core/auto_generated/qgspallabeling.sip.in
@@ -398,10 +398,6 @@ Register a feature for labeling.
                 must have already had the feature and fields sets prior to calling this method.
 :param labelFeature: if using :py:class:`QgsLabelingEngine`, this will receive the label feature. Not available
                      in Python bindings.
-                         should be used as an obstacle for labels (e.g., if the feature has been rendered with an offset point
-                         symbol, the obstacle geometry should represent the bounds of the offset symbol). If not set,
-                         the feature's original geometry will be used as an obstacle for labels. Not available
-                         in Python bindings.
 %End
 
     void readXml( QDomElement &elem, const QgsReadWriteContext &context );

diff --git a/python/core/auto_generated/qgsproject.sip.in b/python/core/auto_generated/qgsproject.sip.in
@@ -765,8 +765,6 @@ The legendLayersAdded() signal is emitted only if addToLegend is true.
 :param addToLegend: If true (by default), the layers will be added to the
                     legend and to the main canvas. If you have a private
                     layer you can set this parameter to false to hide it.
-                      If you specify false here you have take care of deleting
-                      the layers yourself. Not available in Python.
 
 :return: a list of the map layers that were added
          successfully. If a layer or already exists in the registry,
@@ -802,8 +800,6 @@ addMapLayers() instead.
 :param addToLegend: If true (by default), the layer will be added to the
                     legend and to the main canvas. If you have a private
                     layer you can set this parameter to false to hide it.
-                      If you specify false here you have take care of deleting
-                      the layer yourself. Not available in Python.
 
 :return: None if unable to add layer, otherwise pointer to newly added layer
 

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1230,6 +1230,10 @@ sub detect_non_method_member{
                       # exit_with_error('Skipped param (SIP_OUT) should have their doc on a single line');
                       next;
                     }
+                    else
+                    {
+                      next;
+                    }
                   }
                   write_output("CM2", "$doc_prepend$comment_line\n");
                   if ( $comment_line =~ m/:return:/ && $#out_params >= 0 ){

diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -1601,12 +1601,12 @@ class CORE_EXPORT QgsGeometry
 
     /**
      * Modifies geometry to avoid intersections with the layers specified in project properties
-     * \returns 0 in case of success,
-     *         1 if geometry is not of polygon type,
-     *         2 if avoid intersection would change the geometry type,
-     *         3 other error during intersection removal
      * \param avoidIntersectionsLayers list of layers to check for intersections
      * \param ignoreFeatures possibility to give a list of features where intersections should be ignored (not available in Python bindings)
+     * \returns 0 in case of success,
+     *          1 if geometry is not of polygon type,
+     *          2 if avoid intersection would change the geometry type,
+     *          3 other error during intersection removal
      * \since QGIS 1.5
      */
     int avoidIntersections( const QList<QgsVectorLayer *> &avoidIntersectionsLayers,