diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in index 5dd6b5f47ee..9ea57e249c6 100644 --- a/python/core/auto_generated/geometry/qgsgeometry.sip.in +++ b/python/core/auto_generated/geometry/qgsgeometry.sip.in @@ -1492,7 +1492,6 @@ The ``method`` argument dictates which validator to utilize. .. note:: Available in Python bindings since QGIS 1.6 - * %End static QgsGeometry unaryUnion( const QVector &geometries ); diff --git a/python/core/auto_generated/qgseditformconfig.sip.in b/python/core/auto_generated/qgseditformconfig.sip.in index f2f39c43514..d3f4d3e5a39 100644 --- a/python/core/auto_generated/qgseditformconfig.sip.in +++ b/python/core/auto_generated/qgseditformconfig.sip.in @@ -178,7 +178,6 @@ If set to false, the widget at the given index will be read-only. If this returns true, the widget at the given index will receive its label on the previous line while if it returns false, the widget will receive its label on the left hand side. Labeling on top leaves more horizontal space for the widget itself. -* %End void setLabelOnTop( int idx, bool onTop ); @@ -187,7 +186,6 @@ If this is set to true, the widget at the given index will receive its label on the previous line while if it is set to false, the widget will receive its label on the left hand side. Labeling on top leaves more horizontal space for the widget itself. -* %End diff --git a/python/core/auto_generated/qgsfeaturefilterprovider.sip.in b/python/core/auto_generated/qgsfeaturefilterprovider.sip.in index df1bb3e5e98..96e22030ded 100644 --- a/python/core/auto_generated/qgsfeaturefilterprovider.sip.in +++ b/python/core/auto_generated/qgsfeaturefilterprovider.sip.in @@ -21,7 +21,6 @@ A QgsFeatureFilterProvider provides a method for modifying a QgsFeatureRequest i additional filters to the request. .. versionadded:: 2.14 - * %End %TypeHeaderCode diff --git a/python/core/auto_generated/qgsrendercontext.sip.in b/python/core/auto_generated/qgsrendercontext.sip.in index b0fe28d8e76..0d429fb83dc 100644 --- a/python/core/auto_generated/qgsrendercontext.sip.in +++ b/python/core/auto_generated/qgsrendercontext.sip.in @@ -19,7 +19,6 @@ Contains information about the context of a rendering operation. The context of a rendering operation defines properties such as the conversion ratio between screen and map units, the extents to be rendered etc. -* %End %TypeHeaderCode diff --git a/python/core/auto_generated/raster/qgsrasterlayer.sip.in b/python/core/auto_generated/raster/qgsrasterlayer.sip.in index e5c72d0ab20..f5e5358e748 100644 --- a/python/core/auto_generated/raster/qgsrasterlayer.sip.in +++ b/python/core/auto_generated/raster/qgsrasterlayer.sip.in @@ -132,7 +132,6 @@ The main tasks carried out by the constructor are: -Assign sensible defaults for the red, green, blue and gray bands. - -* %End ~QgsRasterLayer(); diff --git a/python/core/auto_generated/symbology/qgsstyle.sip.in b/python/core/auto_generated/symbology/qgsstyle.sip.in index 765fd88935a..3954f542e3d 100644 --- a/python/core/auto_generated/symbology/qgsstyle.sip.in +++ b/python/core/auto_generated/symbology/qgsstyle.sip.in @@ -381,7 +381,6 @@ Returns the names of the symbols which have a matching 'substring' in its defini :param qword: is the query string to search the symbols or colorramps. :return: A QStringList of the matched symbols or colorramps - * %End QStringList tagsOfSymbol( StyleEntity type, const QString &symbol ); diff --git a/python/gui/auto_generated/qgsblendmodecombobox.sip.in b/python/gui/auto_generated/qgsblendmodecombobox.sip.in index 07b7d6f81dc..b91adda3f00 100644 --- a/python/gui/auto_generated/qgsblendmodecombobox.sip.in +++ b/python/gui/auto_generated/qgsblendmodecombobox.sip.in @@ -13,7 +13,6 @@ class QgsBlendModeComboBox : QComboBox { %Docstring A combobox which lets the user select blend modes from a predefined list -* %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgscheckablecombobox.sip.in b/python/gui/auto_generated/qgscheckablecombobox.sip.in index 89e7339da34..4c41746bcaa 100644 --- a/python/gui/auto_generated/qgscheckablecombobox.sip.in +++ b/python/gui/auto_generated/qgscheckablecombobox.sip.in @@ -19,7 +19,6 @@ class QgsCheckableComboBox : QComboBox QComboBox subclass which allows selecting multiple items. .. versionadded:: 3.0 - * %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsencodingfiledialog.sip.in b/python/gui/auto_generated/qgsencodingfiledialog.sip.in index ee443a4e059..50d415c9297 100644 --- a/python/gui/auto_generated/qgsencodingfiledialog.sip.in +++ b/python/gui/auto_generated/qgsencodingfiledialog.sip.in @@ -13,7 +13,6 @@ class QgsEncodingFileDialog: QFileDialog { %Docstring A file dialog which lets the user select the preferred encoding type for a data provider. -* %End %TypeHeaderCode @@ -53,7 +52,6 @@ class QgsEncodingSelectionDialog: QDialog A dialog which presents the user with a choice of file encodings. .. versionadded:: 3.0 - * %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsextentgroupbox.sip.in b/python/gui/auto_generated/qgsextentgroupbox.sip.in index 14ffc705bef..3455e5344fd 100644 --- a/python/gui/auto_generated/qgsextentgroupbox.sip.in +++ b/python/gui/auto_generated/qgsextentgroupbox.sip.in @@ -162,7 +162,6 @@ Returns the current fixed aspect ratio to be used when dragging extent onto the If the aspect ratio isn't fixed, the width and height will be set to zero. .. versionadded:: 3.0 - * %End public slots: @@ -204,7 +203,6 @@ To unset a fixed aspect ratio, set the width and height to zero. :param ratio: aspect ratio's width and height .. versionadded:: 3.0 - * %End signals: diff --git a/python/gui/auto_generated/qgsexternalresourcewidget.sip.in b/python/gui/auto_generated/qgsexternalresourcewidget.sip.in index 91a5ec965d9..cdfa5a7c335 100644 --- a/python/gui/auto_generated/qgsexternalresourcewidget.sip.in +++ b/python/gui/auto_generated/qgsexternalresourcewidget.sip.in @@ -24,7 +24,6 @@ class QgsExternalResourceWidget : QWidget %Docstring Widget to display file path with a push button for an "open file" dialog It can also be used to display a picture or a web page. -* %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsfilterlineedit.sip.in b/python/gui/auto_generated/qgsfilterlineedit.sip.in index aa0b2aa8ce8..2b7aba46f77 100644 --- a/python/gui/auto_generated/qgsfilterlineedit.sip.in +++ b/python/gui/auto_generated/qgsfilterlineedit.sip.in @@ -19,7 +19,6 @@ handling custom null value representations. When using QgsFilterLineEdit the value(), setValue() and clearValue() methods should be used instead of QLineEdit's text(), setText() and clear() methods, and the valueChanged() signal should be used instead of textChanged(). -* %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsmaptoolextent.sip.in b/python/gui/auto_generated/qgsmaptoolextent.sip.in index bbe0c59a4e8..c1fccf94a43 100644 --- a/python/gui/auto_generated/qgsmaptoolextent.sip.in +++ b/python/gui/auto_generated/qgsmaptoolextent.sip.in @@ -47,14 +47,12 @@ Sets a fixed aspect ratio to be used when dragging extent onto the canvas. To unset a fixed aspect ratio, set the width and height to zero. :param ratio: aspect ratio's width and height - * %End QSize ratio() const; %Docstring Returns the current fixed aspect ratio to be used when dragging extent onto the canvas. If the aspect ratio isn't fixed, the width and height will be set to zero. -* %End QgsRectangle extent() const; diff --git a/python/gui/auto_generated/qgspasswordlineedit.sip.in b/python/gui/auto_generated/qgspasswordlineedit.sip.in index 74826963511..b2c5a18289d 100644 --- a/python/gui/auto_generated/qgspasswordlineedit.sip.in +++ b/python/gui/auto_generated/qgspasswordlineedit.sip.in @@ -17,7 +17,6 @@ QLineEdit subclass with built in support for showing/hiding entered password. .. versionadded:: 3.0 - * %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsscalecombobox.sip.in b/python/gui/auto_generated/qgsscalecombobox.sip.in index e62d93b2fd7..584d45f958c 100644 --- a/python/gui/auto_generated/qgsscalecombobox.sip.in +++ b/python/gui/auto_generated/qgsscalecombobox.sip.in @@ -14,7 +14,6 @@ class QgsScaleComboBox : QComboBox %Docstring A combobox which lets the user select map scale from predefined list and highlights nearest to current scale value -* %End %TypeHeaderCode diff --git a/python/gui/auto_generated/qgsscalewidget.sip.in b/python/gui/auto_generated/qgsscalewidget.sip.in index 9de9c545131..333d9d57805 100644 --- a/python/gui/auto_generated/qgsscalewidget.sip.in +++ b/python/gui/auto_generated/qgsscalewidget.sip.in @@ -16,7 +16,6 @@ class QgsScaleWidget : QWidget %Docstring A combobox which lets the user select map scale from predefined list and highlights nearest to current scale value -* %End %TypeHeaderCode @@ -28,7 +27,6 @@ and highlights nearest to current scale value %Docstring QgsScaleWidget creates a combobox which lets the user select map scale from predefined list and highlights nearest to current scale value -* %End void setShowCurrentScaleButton( bool showCurrentScaleButton ); diff --git a/python/server/auto_generated/qgsaccesscontrol.sip.in b/python/server/auto_generated/qgsaccesscontrol.sip.in index f0e4e7420ae..15c8f992fda 100644 --- a/python/server/auto_generated/qgsaccesscontrol.sip.in +++ b/python/server/auto_generated/qgsaccesscontrol.sip.in @@ -18,7 +18,6 @@ class QgsAccessControl : QgsFeatureFilterProvider %Docstring A helper class that centralize the restrictions given by all the access control filter plugins. -* %End %TypeHeaderCode diff --git a/python/server/auto_generated/qgsconfigcache.sip.in b/python/server/auto_generated/qgsconfigcache.sip.in index fbedc1b3ca6..472a4be883a 100644 --- a/python/server/auto_generated/qgsconfigcache.sip.in +++ b/python/server/auto_generated/qgsconfigcache.sip.in @@ -16,12 +16,12 @@ class QgsConfigCache : QObject { %Docstring ************************************************************************* -* + This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * -* + ************************************************************************** %End diff --git a/python/server/auto_generated/qgsfeaturefilter.sip.in b/python/server/auto_generated/qgsfeaturefilter.sip.in index ec41d76183f..12c93bb3e28 100644 --- a/python/server/auto_generated/qgsfeaturefilter.sip.in +++ b/python/server/auto_generated/qgsfeaturefilter.sip.in @@ -17,7 +17,6 @@ class QgsFeatureFilter : QgsFeatureFilterProvider A feature filter provider allowing to set filter expressions on a per-layer basis. .. versionadded:: 3.0 - * %End %TypeHeaderCode diff --git a/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in b/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in index 3b3d126c37a..5a4545fb57a 100644 --- a/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in +++ b/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in @@ -16,7 +16,6 @@ class QgsFeatureFilterProviderGroup : QgsFeatureFilterProvider A filter filter provider grouping several filter providers. .. versionadded:: 3.0 - * %End %TypeHeaderCode diff --git a/scripts/sipify.pl b/scripts/sipify.pl index 6c3df4a68aa..3fbbaa950d9 100755 --- a/scripts/sipify.pl +++ b/scripts/sipify.pl @@ -168,6 +168,10 @@ sub processDoxygenLine { # replace nullptr with None (nullptr means nothing to Python devs) $line =~ s/\bnullptr\b/None/g; + if ( $line eq '*' ) { + $line = ''; + } + # if inside multi-line parameter, ensure additional lines are indented if ($line ne '') { if ( $line !~ m/\s*[\\:]?(param|note|since|return|deprecated|warning)/ ) {