From 0e75f6ef851cbbdf9d20b7650a3f5422f4024ba1 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sun, 27 May 2018 16:56:31 +1000 Subject: [PATCH] Don't indent multiline versionadded/deprecated tags Turns out there isn't any valid ones anyway - the only multiline versionadded tags are due to incorrect ordering of brief/since tags (which is fixed in a different PR) --- .../analysis/auto_generated/network/qgsgraph.sip.in | 2 +- .../network/qgsnetworkdistancestrategy.sip.in | 2 +- .../auto_generated/network/qgsnetworkstrategy.sip.in | 2 +- .../network/qgsvectorlayerdirector.sip.in | 2 +- .../processing/qgsnativealgorithms.sip.in | 2 +- python/core/auto_generated/qgsmaprendererjob.sip.in | 12 ++++++------ .../qgsmaplayerconfigwidgetfactory.sip.in | 2 +- scripts/sipify.pl | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python/analysis/auto_generated/network/qgsgraph.sip.in b/python/analysis/auto_generated/network/qgsgraph.sip.in index 3ff03717c1f9..14b0bd9f1e7e 100644 --- a/python/analysis/auto_generated/network/qgsgraph.sip.in +++ b/python/analysis/auto_generated/network/qgsgraph.sip.in @@ -16,7 +16,7 @@ class QgsGraphEdge %Docstring .. versionadded:: 3.0 - This class implements a graph edge + This class implements a graph edge %End %TypeHeaderCode diff --git a/python/analysis/auto_generated/network/qgsnetworkdistancestrategy.sip.in b/python/analysis/auto_generated/network/qgsnetworkdistancestrategy.sip.in index 748ddfbfd13c..8c845314b104 100644 --- a/python/analysis/auto_generated/network/qgsnetworkdistancestrategy.sip.in +++ b/python/analysis/auto_generated/network/qgsnetworkdistancestrategy.sip.in @@ -13,7 +13,7 @@ class QgsNetworkDistanceStrategy : QgsNetworkStrategy %Docstring .. versionadded:: 3.0 - Strategy for caclulating edge cost based on its length. Should be + Strategy for caclulating edge cost based on its length. Should be used for finding shortest path between two points. %End diff --git a/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in b/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in index 51107e8f07ab..a4d701c313dd 100644 --- a/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in +++ b/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in @@ -20,7 +20,7 @@ class QgsNetworkStrategy %Docstring .. versionadded:: 3.0 - QgsNetworkStrategy defines strategy used for calculation of the edge cost. For example it can + QgsNetworkStrategy defines strategy used for calculation of the edge cost. For example it can take into account travel distance, amount of time or money. Currently there are two strategies implemented in the analysis library: QgsNetworkDistanceStrategy and QgsNetworkSpeedStrategy. QgsNetworkStrategy implemented using "strategy" design pattern. diff --git a/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in b/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in index 00f2673b5646..7dfbf1462300 100644 --- a/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in +++ b/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in @@ -15,7 +15,7 @@ class QgsVectorLayerDirector : QgsGraphDirector %Docstring .. versionadded:: 3.0 - Determine making the graph from vector line layer + Determine making the graph from vector line layer %End %TypeHeaderCode diff --git a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in index 7a1a33d77b7a..3c4951c6fe34 100644 --- a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in +++ b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in @@ -14,7 +14,7 @@ class QgsNativeAlgorithms: QgsProcessingProvider %Docstring .. versionadded:: 3.0 - Native c++ processing algorithm provider. + Native c++ processing algorithm provider. %End %TypeHeaderCode diff --git a/python/core/auto_generated/qgsmaprendererjob.sip.in b/python/core/auto_generated/qgsmaprendererjob.sip.in index 567bfc36e40b..323e2067c8e4 100644 --- a/python/core/auto_generated/qgsmaprendererjob.sip.in +++ b/python/core/auto_generated/qgsmaprendererjob.sip.in @@ -99,18 +99,18 @@ This should not be used if cached labeling was redrawn - see usedCachedLabels(). %Docstring .. versionadded:: 3.0 - Set the feature filter provider used by the QgsRenderContext of - each LayerRenderJob. - Ownership is not transferred and the provider must not be deleted - before the render job. +Set the feature filter provider used by the QgsRenderContext of +each LayerRenderJob. +Ownership is not transferred and the provider must not be deleted +before the render job. %End const QgsFeatureFilterProvider *featureFilterProvider() const; %Docstring .. versionadded:: 3.0 - Returns the feature filter provider used by the QgsRenderContext of - each LayerRenderJob. +Returns the feature filter provider used by the QgsRenderContext of +each LayerRenderJob. %End struct Error diff --git a/python/gui/auto_generated/qgsmaplayerconfigwidgetfactory.sip.in b/python/gui/auto_generated/qgsmaplayerconfigwidgetfactory.sip.in index 86e46edd39b2..3d2ce481ad66 100644 --- a/python/gui/auto_generated/qgsmaplayerconfigwidgetfactory.sip.in +++ b/python/gui/auto_generated/qgsmaplayerconfigwidgetfactory.sip.in @@ -14,7 +14,7 @@ class QgsMapLayerConfigWidgetFactory %Docstring .. versionadded:: 2.16 - Factory class for creating custom map layer property pages +Factory class for creating custom map layer property pages %End %TypeHeaderCode diff --git a/scripts/sipify.pl b/scripts/sipify.pl index 1b0803c60ec1..2423b3d8664c 100755 --- a/scripts/sipify.pl +++ b/scripts/sipify.pl @@ -217,11 +217,11 @@ sub processDoxygenLine { return ""; } if ( $line =~ m/\\since .*?([\d\.]+)/i ) { - $INDENT = ' '; + $INDENT = ''; return "\n.. versionadded:: $1\n"; } if ( $line =~ m/\\deprecated (.*)/i ) { - $INDENT = ' '; + $INDENT = ''; return "\n.. deprecated:: $1\n"; }