Skip to content

Commit edfb7e1

Browse files
committedDec 18, 2018
run sipify
1 parent 9b852fb commit edfb7e1

28 files changed

+49
-67
lines changed
 

‎python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ Calculates interpolation value for map coordinates x, y
8282

8383
:param x: x-coordinate (in map units)
8484
:param y: y-coordinate (in map units)
85-
:param result: out: interpolation result
8685
:param feedback: optional feedback object for progress and cancelation support
8786

8887
:return: 0 in case of success*
88+
result: out: interpolation result
8989
%End
9090

9191

‎python/core/auto_generated/expression/qgsexpression.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ Tests whether a string is a valid expression.
249249

250250
:param text: string to test
251251
:param context: optional expression context
252-
:param errorMessage: will be filled with any error message from the validation
253252

254253
:return: true if string is a valid expression
254+
errorMessage: will be filled with any error message from the validation
255255

256256
.. versionadded:: 2.12
257257
%End

‎python/core/auto_generated/geometry/qgsabstractgeometry.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ Returns next vertex id and coordinates
306306

307307
:param id: initial value should be the starting vertex id. The next vertex id will be stored
308308
in this variable if found.
309-
:param vertex: container for found node
310309

311310
:return: false if at end
311+
vertex: container for found node
312312
%End
313313

314314
virtual void adjacentVertices( QgsVertexId vertex, QgsVertexId &previousVertex /Out/, QgsVertexId &nextVertex /Out/ ) const = 0;
@@ -344,13 +344,13 @@ Searches for the closest segment of the geometry to a given point.
344344
:param pt: specifies the point to find closest segment to
345345
:param segmentPt: storage for the closest point within the geometry
346346
:param vertexAfter: storage for the ID of the vertex at the end of the closest segment
347-
:param leftOf: indicates whether the point lies on the left side of the geometry (-1 if point is to the left
348347
of the geometry, +1 if the point is to the right of the geometry, or 0 for cases where left/right could not
349348
be determined, e.g. point exactly on a line)
350349
false if point is to right of segment)
351350
:param epsilon: epsilon for segment snapping
352351

353352
:return: squared distance to closest segment or negative value on error
353+
leftOf: indicates whether the point lies on the left side of the geometry (-1 if point is to the left
354354
%End
355355

356356

‎python/core/auto_generated/geometry/qgscurve.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ Sums up the area of the curve by iterating over the vertices (shoelace formula).
134134
Returns the point and vertex id of a point within the curve.
135135

136136
:param node: node number, where the first node is 0
137-
:param point: will be set to point at corresponding node in the curve
138137
:param type: will be set to the vertex type of the node
139138

140139
:return: true if node exists within the curve
140+
point: will be set to point at corresponding node in the curve
141141
%End
142142

143143
virtual QgsCurve *reversed() const = 0 /Factory/;

‎python/core/auto_generated/geometry/qgsgeometry.sip.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,24 +632,24 @@ Returns the shortest line joining this geometry to another geometry.
632632
Searches for the closest vertex in this geometry to the given point.
633633

634634
:param point: Specifiest the point for search
635-
:param atVertex: Receives index of the closest vertex
636635

637636
:return: The squared Cartesian distance is also returned in sqrDist, negative number on error
637+
atVertex: Receives index of the closest vertex
638638
%End
639639

640640
double closestSegmentWithContext( const QgsPointXY &point, QgsPointXY &minDistPoint /Out/, int &afterVertex /Out/, int *leftOf /Out/ = 0, double epsilon = DEFAULT_SEGMENT_EPSILON ) const;
641641
%Docstring
642642
Searches for the closest segment of geometry to the given point
643643

644644
:param point: Specifies the point for search
645-
:param minDistPoint: Receives the nearest point on the segment
646645
:param afterVertex: Receives index of the vertex after the closest segment. The vertex
647646
before the closest segment is always afterVertex - 1
648647
:param leftOf: Out: Returns if the point lies on the left of left side of the geometry ( < 0 means left, > 0 means right, 0 indicates
649648
that the test was unsuccessful, e.g. for a point exactly on the line)
650649
:param epsilon: epsilon for segment snapping
651650

652651
:return: The squared Cartesian distance is also returned in sqrDist, negative number on error
652+
minDistPoint: Receives the nearest point on the segment
653653
%End
654654

655655
OperationResult addRing( const QVector<QgsPointXY> &ring );
@@ -818,7 +818,6 @@ width and height of the rotated bounding box will also be returned.
818818
%Docstring
819819
Returns the minimal enclosing circle for the geometry.
820820

821-
:param center: Center of the minimal enclosing circle returneds
822821
:param radius: Radius of the minimal enclosing circle returned
823822
:param segments: Number of segments used to segment geometry. :py:func:`QgsEllipse.toPolygon`
824823

@@ -1593,7 +1592,6 @@ Modifies geometry to avoid intersections with the layers specified in project pr
15931592
3 other error during intersection removal
15941593

15951594
:param avoidIntersectionsLayers: list of layers to check for intersections
1596-
:param ignoreFeatures: possibility to give a list of features where intersections should be ignored (not available in Python bindings)
15971595

15981596
.. versionadded:: 1.5
15991597
%End

‎python/core/auto_generated/geometry/qgsgeometryutils.sip.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ Retrieves the vertices which are before and after the interpolated point at a sp
6666
:param geometry: line or polygon geometry
6767
:param distance: distance to traverse along geometry
6868
:param previousVertex: will be set to previous vertex ID
69-
:param nextVertex: will be set to next vertex ID
7069

7170
:return: true if vertices were successfully retrieved
71+
nextVertex: will be set to next vertex ID
7272

7373
.. note::
7474

@@ -97,9 +97,9 @@ supported and is retrieved from the first 3D point amongst ``p1`` and
9797
:param v1: Direction vector of the first line
9898
:param p2: Point on the second line
9999
:param v2: Direction vector of the second line
100-
:param intersection: Output parameter, the intersection point
101100

102101
:return: Whether the lines intersect
102+
intersection: Output parameter, the intersection point
103103
%End
104104

105105
static bool segmentIntersection( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &q1, const QgsPoint &q2, QgsPoint &intersectionPoint /Out/, bool &isIntersection /Out/, double tolerance = 1e-8, bool acceptImproperIntersection = false );
@@ -110,12 +110,12 @@ Compute the intersection between two segments
110110
:param p2: First segment end point
111111
:param q1: Second segment start point
112112
:param q2: Second segment end point
113-
:param intersectionPoint: Output parameter, the intersection point
114113
:param isIntersection: Output parameter, return true if an intersection is found
115114
:param tolerance: The tolerance to use
116115
:param acceptImproperIntersection: By default, this method returns true only if segments have proper intersection. If set true, returns also true if segments have improper intersection (end of one segment on other segment ; continuous segments).
117116

118117
:return: Whether the segments intersect
118+
intersectionPoint: Output parameter, the intersection point
119119
* Example:
120120
.. code-block:: python
121121

@@ -515,7 +515,6 @@ Returns the coefficients (a, b, c for equation "ax + by + c = 0") of a line defi
515515

516516
:param pt1: first point.
517517
:param pt2: second point.
518-
:param a: Output parameter, a coefficient of the equation.
519518
:param b: Output parameter, b coefficient of the equation.
520519
:param c: Output parameter, c coefficient of the equation.
521520

@@ -574,9 +573,9 @@ An algorithm to calculate an (approximate) intersection of two lines in 3D.
574573
:param La2: is the second point on the first line,
575574
:param Lb1: is the first point on the second line,
576575
:param Lb2: is the second point on the second line,
577-
:param intersection: is the result intersection, of it can be found.
578576

579577
:return: true if the intersection can be found, false - otherwise.
578+
intersection: is the result intersection, of it can be found.
580579
example:
581580
.. code-block:: python
582581

‎python/core/auto_generated/qgsdistancearea.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ otherwise QgsPoint.project() will be called after QgsUnitTypes.fromUnitToUnitFac
221221
:param p1: start point [can be Cartesian or Geographic]
222222
:param distance: must be in meters
223223
:param azimuth: - azimuth in radians, clockwise from North
224-
:param projectedPoint: calculated projected point
225224

226225
:return: distance in mapUnits
226+
projectedPoint: calculated projected point
227227

228228
.. seealso:: :py:func:`sourceCrs`
229229

‎python/core/auto_generated/qgsmaplayer.sip.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,10 @@ Save the current metadata of this layer as the default metadata
650650
(either as a .qmd file on disk or as a
651651
record in the users style table in their personal qgis.db)
652652

653-
:param resultFlag: a reference to a flag that will be set to false if
654653
we did not manage to save the default metadata.
655654

656655
:return: a QString with any status messages
656+
resultFlag: a reference to a flag that will be set to false if
657657

658658
.. versionadded:: 3.0
659659
%End
@@ -688,10 +688,10 @@ record in the users style table in their personal qgis.db)
688688
is a file and load that, if that fails the qgis.db metadata
689689
table will be consulted to see if there is a metadata who's
690690
key matches the URI.
691-
:param resultFlag: a reference to a flag that will be set to false if
692691
we did not manage to load the default metadata.
693692

694693
:return: a QString with any status messages
694+
resultFlag: a reference to a flag that will be set to false if
695695

696696
.. versionadded:: 3.0
697697
%End
@@ -752,10 +752,10 @@ Retrieve the default style for this layer if one
752752
exists (either as a .qml file on disk or as a
753753
record in the users style table in their personal qgis.db)
754754

755-
:param resultFlag: a reference to a flag that will be set to false if
756755
we did not manage to load the default style.
757756

758757
:return: a QString with any status messages
758+
resultFlag: a reference to a flag that will be set to false if
759759

760760
.. seealso:: :py:func:`also`
761761
%End
@@ -771,11 +771,11 @@ record in the users style table in their personal qgis.db)
771771
is a file and load that, if that fails the qgis.db styles
772772
table will be consulted to see if there is a style who's
773773
key matches the URI.
774-
:param resultFlag: a reference to a flag that will be set to false if
775774
we did not manage to load the default style.
776775
:param categories: the style categories to be loaded.
777776

778777
:return: a QString with any status messages
778+
resultFlag: a reference to a flag that will be set to false if
779779

780780
.. seealso:: :py:func:`also`
781781
%End
@@ -786,9 +786,9 @@ Retrieve a named style for this layer from a sqlite database.
786786

787787
:param db: path to sqlite database
788788
:param uri: uri for table
789-
:param qml: will be set to QML style content from database
790789

791790
:return: true if style was successfully loaded
791+
qml: will be set to QML style content from database
792792
%End
793793

794794
virtual bool importNamedStyle( QDomDocument &doc, QString &errorMsg /Out/,
@@ -834,10 +834,10 @@ Save the properties of this layer as the default style
834834
(either as a .qml file on disk or as a
835835
record in the users style table in their personal qgis.db)
836836

837-
:param resultFlag: a reference to a flag that will be set to false if
838837
we did not manage to save the default style.
839838

840839
:return: a QString with any status messages
840+
resultFlag: a reference to a flag that will be set to false if
841841

842842
.. seealso:: :py:func:`loadNamedStyle`
843843
%End
@@ -853,11 +853,11 @@ record in the users style table in their personal qgis.db)
853853
is a file and save to that, if that fails the qgis.db styles
854854
table will be used to create a style entry who's
855855
key matches the URI.
856-
:param resultFlag: a reference to a flag that will be set to false if
857856
we did not manage to save the default style.
858857
:param categories: the style categories to be saved.
859858

860859
:return: a QString with any status messages
860+
resultFlag: a reference to a flag that will be set to false if
861861

862862
.. seealso:: :py:func:`saveDefaultStyle`
863863
%End

‎python/core/auto_generated/qgsmaplayerstore.sip.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ to the store.
119119
The layersAdded() and layerWasAdded() signals will always be emitted.
120120

121121
:param layers: A list of layer which should be added to the store.
122-
:param takeOwnership: Ownership will be transferred to the layer store.
123122
If you specify false here you have take care of deleting
124123
the layers yourself. Not available in Python.
125124

@@ -142,7 +141,6 @@ If you are adding multiple layers at once, you should use
142141
addMapLayers() instead.
143142

144143
:param layer: A layer to add to the store
145-
:param takeOwnership: Ownership will be transferred to the layer store.
146144
If you specify false here you have take care of deleting
147145
the layers yourself. Not available in Python.
148146

‎python/core/auto_generated/qgspallabeling.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ Register a feature for labeling.
398398
must have already had the feature and fields sets prior to calling this method.
399399
:param labelFeature: if using :py:class:`QgsLabelingEngine`, this will receive the label feature. Not available
400400
in Python bindings.
401-
:param obstacleGeometry: optional obstacle geometry, if a different geometry to the feature's geometry
402401
should be used as an obstacle for labels (e.g., if the feature has been rendered with an offset point
403402
symbol, the obstacle geometry should represent the bounds of the offset symbol). If not set,
404403
the feature's original geometry will be used as an obstacle for labels. Not available

‎python/core/auto_generated/qgsproject.sip.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,6 @@ The legendLayersAdded() signal is emitted only if addToLegend is true.
765765
:param addToLegend: If true (by default), the layers will be added to the
766766
legend and to the main canvas. If you have a private
767767
layer you can set this parameter to false to hide it.
768-
:param takeOwnership: Ownership will be transferred to the layer registry.
769768
If you specify false here you have take care of deleting
770769
the layers yourself. Not available in Python.
771770

@@ -803,7 +802,6 @@ addMapLayers() instead.
803802
:param addToLegend: If true (by default), the layer will be added to the
804803
legend and to the main canvas. If you have a private
805804
layer you can set this parameter to false to hide it.
806-
:param takeOwnership: Ownership will be transferred to the layer registry.
807805
If you specify false here you have take care of deleting
808806
the layer yourself. Not available in Python.
809807

‎python/core/auto_generated/qgsproperty.sip.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ Calculates the current value of the property, including any transforms which are
321321
in the expression context can be used to alter the calculated value for the property, so that a property
322322
is able to respond to the current environment, layers and features within QGIS.
323323
:param defaultValue: default value to return if the property is not active or cannot be calculated
324-
:param ok: if specified, will be set to true if conversion was successful
325324

326325
:return: calculated value for property
326+
ok: if specified, will be set to true if conversion was successful
327327

328328
.. seealso:: :py:func:`valueAsString`
329329

@@ -342,9 +342,9 @@ Calculates the current value of the property and interprets it as a string.
342342

343343
:param context: QgsExpressionContext to evaluate the property for.
344344
:param defaultString: default string to return if the property cannot be calculated as a string
345-
:param ok: if specified, will be set to true if conversion was successful
346345

347346
:return: value parsed to string
347+
ok: if specified, will be set to true if conversion was successful
348348

349349
.. seealso:: :py:func:`value`
350350

@@ -363,9 +363,9 @@ Calculates the current value of the property and interprets it as a color.
363363

364364
:param context: QgsExpressionContext to evaluate the property for.
365365
:param defaultColor: default color to return if the property cannot be calculated as a color
366-
:param ok: if specified, will be set to true if conversion was successful
367366

368367
:return: value parsed to color
368+
ok: if specified, will be set to true if conversion was successful
369369

370370
.. seealso:: :py:func:`value`
371371

@@ -384,9 +384,9 @@ Calculates the current value of the property and interprets it as a double.
384384

385385
:param context: QgsExpressionContext to evaluate the property for.
386386
:param defaultValue: default double to return if the property cannot be calculated as a double
387-
:param ok: if specified, will be set to true if conversion was successful
388387

389388
:return: value parsed to double
389+
ok: if specified, will be set to true if conversion was successful
390390

391391
.. seealso:: :py:func:`value`
392392

@@ -405,9 +405,9 @@ Calculates the current value of the property and interprets it as an integer.
405405

406406
:param context: QgsExpressionContext to evaluate the property for.
407407
:param defaultValue: default integer to return if the property cannot be calculated as an integer
408-
:param ok: if specified, will be set to true if conversion was successful
409408

410409
:return: value parsed to integer
410+
ok: if specified, will be set to true if conversion was successful
411411

412412
.. seealso:: :py:func:`value`
413413

@@ -426,9 +426,9 @@ Calculates the current value of the property and interprets it as an boolean.
426426

427427
:param context: QgsExpressionContext to evaluate the property for.
428428
:param defaultValue: default boolean to return if the property cannot be calculated as an boolean
429-
:param ok: if specified, will be set to true if conversion was successful
430429

431430
:return: value parsed to boolean
431+
ok: if specified, will be set to true if conversion was successful
432432

433433
.. seealso:: :py:func:`value`
434434

‎python/core/auto_generated/qgspropertycollection.sip.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ Calculates the current value of the property with the specified key and interpre
117117
int and used for the key value.
118118
:param context: QgsExpressionContext to evaluate the property for.
119119
:param defaultString: default string to return if the property cannot be calculated as a string
120-
:param ok: if specified, will be set to true if conversion was successful
121120

122121
:return: value parsed to string
122+
ok: if specified, will be set to true if conversion was successful
123123

124124
.. seealso:: :py:func:`value`
125125

@@ -140,9 +140,9 @@ Calculates the current value of the property with the specified key and interpre
140140
int and used for the key value.
141141
:param context: QgsExpressionContext to evaluate the property for.
142142
:param defaultColor: default color to return if the property cannot be calculated as a color
143-
:param ok: if specified, will be set to true if conversion was successful
144143

145144
:return: value parsed to color
145+
ok: if specified, will be set to true if conversion was successful
146146

147147
.. seealso:: :py:func:`value`
148148

@@ -163,9 +163,9 @@ Calculates the current value of the property with the specified key and interpre
163163
int and used for the key value.
164164
:param context: QgsExpressionContext to evaluate the property for.
165165
:param defaultValue: default double to return if the property cannot be calculated as a double
166-
:param ok: if specified, will be set to true if conversion was successful
167166

168167
:return: value parsed to double
168+
ok: if specified, will be set to true if conversion was successful
169169

170170
.. seealso:: :py:func:`value`
171171

@@ -186,9 +186,9 @@ Calculates the current value of the property with the specified key and interpre
186186
int and used for the key value.
187187
:param context: QgsExpressionContext to evaluate the property for.
188188
:param defaultValue: default integer to return if the property cannot be calculated as a integer
189-
:param ok: if specified, will be set to true if conversion was successful
190189

191190
:return: value parsed to integer
191+
ok: if specified, will be set to true if conversion was successful
192192

193193
.. seealso:: :py:func:`value`
194194

@@ -209,9 +209,9 @@ Calculates the current value of the property with the specified key and interpre
209209
int and used for the key value.
210210
:param context: QgsExpressionContext to evaluate the property for.
211211
:param defaultValue: default boolean to return if the property cannot be calculated as a boolean
212-
:param ok: if specified, will be set to true if conversion was successful
213212

214213
:return: value parsed to bool
214+
ok: if specified, will be set to true if conversion was successful
215215

216216
.. seealso:: :py:func:`value`
217217

‎python/core/auto_generated/qgspropertytransformer.sip.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,14 @@ of a sub-expression reflecting the parent property's state.
295295
Attempts to parse an expression into a corresponding property transformer.
296296

297297
:param expression: expression to parse
298-
:param baseExpression: will be set to the component of the source expression which
299298
is used to calculate the input to the property transformer. This will be set to an
300299
empty string if a field reference is the transformer input.
301300
:param fieldName: will be set to a field name which is used to calculate the input
302301
to the property transformer. This will be set to an
303302
empty string if an expression is the transformer input.
304303

305304
:return: corresponding property transformer, or None if expression could not
305+
baseExpression: will be set to the component of the source expression which
306306
be parsed to a transformer.
307307
%End
308308

@@ -364,14 +364,14 @@ Constructor for QgsGenericNumericTransformer.
364364
Attempts to parse an expression into a corresponding :py:class:`QgsSizeScaleTransformer`.
365365

366366
:param expression: expression to parse
367-
:param baseExpression: will be set to the component of the source expression which
368367
is used to calculate the input to the property transformer. This will be set to an
369368
empty string if a field reference is the transformer input.
370369
:param fieldName: will be set to a field name which is used to calculate the input
371370
to the property transformer. This will be set to an
372371
empty string if an expression is the transformer input.
373372

374373
:return: corresponding :py:class:`QgsSizeScaleTransformer`, or None if expression could not
374+
baseExpression: will be set to the component of the source expression which
375375
be parsed to a size scale transformer.
376376
%End
377377

@@ -513,14 +513,14 @@ Constructor for QgsSizeScaleTransformer.
513513
Attempts to parse an expression into a corresponding QgsSizeScaleTransformer.
514514

515515
:param expression: expression to parse
516-
:param baseExpression: will be set to the component of the source expression which
517516
is used to calculate the input to the property transformer. This will be set to an
518517
empty string if a field reference is the transformer input.
519518
:param fieldName: will be set to a field name which is used to calculate the input
520519
to the property transformer. This will be set to an
521520
empty string if an expression is the transformer input.
522521

523522
:return: corresponding QgsSizeScaleTransformer, or None if expression could not
523+
baseExpression: will be set to the component of the source expression which
524524
be parsed to a size scale transformer.
525525
%End
526526

‎python/core/auto_generated/qgstransaction.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ Roll back transaction.
8989
Execute the ``sql`` string.
9090

9191
:param sql: The sql query to execute
92-
:param error: The error message
9392
:param isDirty: Flag to indicate if the underlying data will be modified
9493
:param name: Name of the transaction ( only used if `isDirty` is true)
9594

9695
:return: true if everything is OK, false otherwise
96+
error: The error message
9797
%End
9898

9999
static bool supportsTransaction( const QgsVectorLayer *layer );

‎python/core/auto_generated/qgsunittypes.sip.in

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ Encodes a distance unit to a string.
152152
Decodes a distance unit from a string.
153153

154154
:param string: string to decode
155-
:param ok: optional boolean, will be set to true if string was converted successfully
156155

157156
:return: decoded units
157+
ok: optional boolean, will be set to true if string was converted successfully
158158

159159
.. seealso:: :py:func:`encodeUnit`
160160
%End
@@ -184,7 +184,6 @@ Returns a translated abbreviation representing a distance unit.
184184
Converts a translated string to a distance unit.
185185

186186
:param string: string representing a distance unit
187-
:param ok: optional boolean, will be set to true if string was converted successfully
188187

189188
.. seealso:: :py:func:`toString`
190189
%End
@@ -221,9 +220,9 @@ Encodes an areal unit to a string.
221220
Decodes an areal unit from a string.
222221

223222
:param string: string to decode
224-
:param ok: optional boolean, will be set to true if string was converted successfully
225223

226224
:return: decoded units
225+
ok: optional boolean, will be set to true if string was converted successfully
227226

228227
.. seealso:: :py:func:`encodeUnit`
229228
%End
@@ -253,7 +252,6 @@ Returns a translated abbreviation representing an areal unit.
253252
Converts a translated string to an areal unit.
254253

255254
:param string: string representing an areal unit
256-
:param ok: optional boolean, will be set to true if string was converted successfully
257255

258256
.. seealso:: :py:func:`toString`
259257
%End
@@ -294,9 +292,9 @@ Encodes an angular unit to a string.
294292
Decodes an angular unit from a string.
295293

296294
:param string: string to decode
297-
:param ok: optional boolean, will be set to true if string was converted successfully
298295

299296
:return: decoded units
297+
ok: optional boolean, will be set to true if string was converted successfully
300298

301299
.. seealso:: :py:func:`encodeUnit`
302300
%End
@@ -403,9 +401,9 @@ Encodes a render unit to a string.
403401
Decodes a render unit from a string.
404402

405403
:param string: string to decode
406-
:param ok: optional boolean, will be set to true if string was converted successfully
407404

408405
:return: decoded units
406+
ok: optional boolean, will be set to true if string was converted successfully
409407

410408
.. seealso:: :py:func:`encodeUnit`
411409
%End
@@ -437,9 +435,9 @@ Encodes a layout unit to a string.
437435
Decodes a layout unit from a string.
438436

439437
:param string: string to decode
440-
:param ok: optional boolean, will be set to true if string was converted successfully
441438

442439
:return: decoded units
440+
ok: optional boolean, will be set to true if string was converted successfully
443441

444442
.. seealso:: :py:func:`encodeUnit`
445443

‎python/core/auto_generated/qgsvectordataprovider.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ Returns the possible enum values of an attribute. Returns an empty stringlist if
228228
or if the given attribute is not an enum type.
229229

230230
:param index: the index of the attribute
231-
:param enumList: reference to the list to fill
232231
%End
233232

234233
virtual bool addFeatures( QgsFeatureList &flist /In,Out/, QgsFeatureSink::Flags flags = 0 );

‎python/core/auto_generated/qgsvectorlayer.sip.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,6 @@ Save named and sld style of the layer to the style table in the db.
786786
:param description:
787787
:param useAsDefault:
788788
:param uiFileContent:
789-
:param msgError:
790789
%End
791790

792791
virtual int listStylesInDatabase( QStringList &ids /Out/, QStringList &names /Out/,
@@ -796,10 +795,10 @@ Lists all the style in db split into related to the layer and not related to
796795

797796
:param ids: the list in which will be stored the style db ids
798797
:param names: the list in which will be stored the style names
799-
:param descriptions: the list in which will be stored the style descriptions
800798
:param msgError:
801799

802800
:return: the number of styles related to current layer
801+
descriptions: the list in which will be stored the style descriptions
803802

804803
.. note::
805804

@@ -816,9 +815,9 @@ Will return the named style corresponding to style id provided
816815
Delete a style from the database
817816

818817
:param styleId: the provider's layer_styles table id of the style to delete
819-
:param msgError: reference to string that will be updated with any error messages
820818

821819
:return: true in case of success
820+
msgError: reference to string that will be updated with any error messages
822821

823822
.. versionadded:: 3.0
824823
%End

‎python/core/auto_generated/qgsvectorlayerjoinbuffer.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ Finds the vector join for a layer field index.
8585

8686
:param index: this layers attribute index
8787
:param fields: fields of the vector layer (including joined fields)
88-
:param sourceFieldIndex: Output: field's index in source layer *
8988
%End
9089

9190
int joinedFieldsOffset( const QgsVectorLayerJoinInfo *info, const QgsFields &fields );

‎python/core/auto_generated/qgsvectorlayertools.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ This method should/will be called, whenever a new feature will be added to the l
3434
:param layer: The layer to which the feature should be added
3535
:param defaultValues: Default values for the feature to add
3636
:param defaultGeometry: A default geometry to add to the feature
37-
:param feature: Updated feature after adding will be written back to this
3837

3938
:return: True in case of success, False if the operation failed/was aborted
39+
feature: Updated feature after adding will be written back to this
4040

4141
TODO QGIS 3: remove const qualifier
4242
%End
@@ -86,9 +86,9 @@ Copy and move features with defined translation.
8686
:param request: The request for the features to be moved. It will be assigned to a new feature request with the newly copied features.
8787
:param dx: The translation on x
8888
:param dy: The translation on y
89-
:param errorMsg: If given, it will contain the error message
9089

9190
:return: True if all features could be copied.
91+
errorMsg: If given, it will contain the error message
9292

9393
TODO QGIS 3: remove const qualifier
9494
%End

‎python/core/auto_generated/qgsziputils.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ not writable.
3333

3434
:param zip: The zip filename
3535
:param dir: The output directory
36-
:param files: The absolute path of unzipped files
3736

3837
.. versionadded:: 3.0
3938
%End

‎python/core/auto_generated/raster/qgsrastershader.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Generates a new RGBA value based on one input ``value``.
5858
:param returnRedValue: The red component of the new RGBA value
5959
:param returnGreenValue: The green component of the new RGBA value
6060
:param returnBlueValue: The blue component of the new RGBA value
61-
:param returnAlpha: The alpha component of the new RGBA value
6261

6362
:return: True if the return values are valid otherwise false
63+
returnAlpha: The alpha component of the new RGBA value
6464
%End
6565

6666
bool shade( double redValue,
@@ -81,9 +81,9 @@ Generates a new RGBA value based on an original RGBA value.
8181
:param returnRedValue: The red component of the new RGBA value
8282
:param returnGreenValue: The green component of the new RGBA value
8383
:param returnBlueValue: The blue component of the new RGBA value
84-
:param returnAlpha: The alpha component of the new RGBA value
8584

8685
:return: True if the return values are valid otherwise false
86+
returnAlpha: The alpha component of the new RGBA value
8787
%End
8888

8989
void setRasterShaderFunction( QgsRasterShaderFunction *function /Transfer/ );

‎python/core/auto_generated/raster/qgsrastershaderfunction.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ Generates an new RGBA value based on one input ``value``.
6262
:param returnRedValue: The red component of the new RGBA value
6363
:param returnGreenValue: The green component of the new RGBA value
6464
:param returnBlueValue: The blue component of the new RGBA value
65-
:param returnAlpha: The alpha component of the new RGBA value
6665

6766
:return: True if the return values are valid otherwise false
67+
returnAlpha: The alpha component of the new RGBA value
6868
%End
6969

7070
virtual bool shade( double redValue,
@@ -85,9 +85,9 @@ Generates an new RGBA value based on an original RGBA value.
8585
:param returnRedValue: The red component of the new RGBA value
8686
:param returnGreenValue: The green component of the new RGBA value
8787
:param returnBlueValue: The blue component of the new RGBA value
88-
:param returnAlpha: The alpha component of the new RGBA value
8988

9089
:return: True if the return values are valid otherwise false
90+
returnAlpha: The alpha component of the new RGBA value
9191
%End
9292

9393
double minimumMaximumRange() const;

‎python/gui/auto_generated/editorwidgets/core/qgseditorwidgetautoconf.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Typical scores are:
3232

3333
:param vl: The vector layer for which this widget will be created
3434
:param fieldName: The field name on the specified layer for which this widget will be created
35-
:param score: Where the score is returned (default to 0)
3635

3736
:return: and integer value rating how good is the setup provided by this plugin.
37+
score: Where the score is returned (default to 0)
3838
%End
3939

4040
};

‎python/gui/auto_generated/editorwidgets/core/qgseditorwidgetregistry.sip.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ The editor may be NULL if you want the widget wrapper to create a default widget
7474
:param config: A configuration which should be used for the widget creation
7575
:param editor: An editor widget which will be used instead of an autocreated widget
7676
:param parent: The parent which will be used for the created wrapper and the created widget
77-
:param context: The editor context (not available in Python bindings)
7877

7978
:return: A new widget wrapper
8079
%End
@@ -92,7 +91,6 @@ The editor may be NULL if you want the widget wrapper to create a default widget
9291
:param fieldIdx: The field index on the specified layer for which this widget will be created
9392
:param editor: An editor widget which will be used instead of an autocreated widget
9493
:param parent: The parent which will be used for the created wrapper and the created widget
95-
:param context: The editor context (not available in Python bindings)
9694

9795
:return: A new widget wrapper
9896
%End

‎python/gui/auto_generated/qgsattributeformwidget.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ A new form widget for the wrapper ``widget`` on ``form``.
4242
Creates the search widget wrappers for the widget used when the form is in
4343
search mode.
4444

45-
:param context: editor context (not available in Python bindings)
4645
%End
4746

4847
virtual QString currentFilterExpression() const;

‎python/gui/auto_generated/qgsexpressionlineedit.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ Returns the current expression shown in the widget.
112112
%Docstring
113113
Returns true if the current expression is valid.
114114

115-
:param expressionError: will be set to any generated error message if specified
116115
%End
117116

118117
void registerExpressionContextGenerator( const QgsExpressionContextGenerator *generator );

‎python/server/auto_generated/qgsserverexception.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Constructor
3838
%Docstring
3939
Format the exception for sending to client
4040

41-
:param responseFormat: QString to store the content type of the response format.
4241

4342
:return: QByteArray the fermatted response.
43+
responseFormat: QString to store the content type of the response format.
4444

4545
The defaolt implementation return text/xml format.
4646
%End

0 commit comments

Comments
 (0)
Please sign in to comment.