Skip to content

Commit 28a2120

Browse files
committed
[sipify] seealso
1 parent 897e2f0 commit 28a2120

File tree

71 files changed

+1189
-1139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1189
-1139
lines changed

python/auto_sip.blacklist

-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ gui/qgstreewidgetitem.sip
401401
gui/qgsunitselectionwidget.sip
402402
gui/qgsuserinputdockwidget.sip
403403
gui/qgsvariableeditorwidget.sip
404-
gui/qgsvertexmarker.sip
405404
gui/attributetable/qgsattributetabledelegate.sip
406405
gui/attributetable/qgsattributetablefiltermodel.sip
407406
gui/attributetable/qgsattributetablemodel.sip

python/core/annotations/qgsannotationmanager.sip

+11-11
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class QgsAnnotationManager : QObject
4242
%Docstring
4343
Adds an annotation to the manager. Ownership of the annotation is transferred to the manager.
4444
Returns true if the addition was successful, or false if the annotation could not be added.
45-
\see removeAnnotation()
46-
\see annotationAdded()
45+
.. seealso:: removeAnnotation()
46+
.. seealso:: annotationAdded()
4747
:rtype: bool
4848
%End
4949

@@ -52,23 +52,23 @@ class QgsAnnotationManager : QObject
5252
Removes an annotation from the manager. The annotation is deleted.
5353
Returns true if the removal was successful, or false if the removal failed (eg as a result
5454
of removing an annotation which is not contained in the manager).
55-
\see addAnnotation()
56-
\see compositionRemoved()
57-
\see compositionAboutToBeRemoved()
58-
\see clear()
55+
.. seealso:: addAnnotation()
56+
.. seealso:: compositionRemoved()
57+
.. seealso:: compositionAboutToBeRemoved()
58+
.. seealso:: clear()
5959
:rtype: bool
6060
%End
6161

6262
void clear();
6363
%Docstring
6464
Removes and deletes all annotations from the manager.
65-
\see removeAnnotation()
65+
.. seealso:: removeAnnotation()
6666
%End
6767

6868
QList< QgsAnnotation * > annotations() const;
6969
%Docstring
7070
Returns a list of all annotations contained in the manager.
71-
\see cloneAnnotations()
71+
.. seealso:: cloneAnnotations()
7272
:rtype: list of QgsAnnotation
7373
%End
7474

@@ -77,22 +77,22 @@ class QgsAnnotationManager : QObject
7777
Returns a list containing clones of all annotations contained
7878
in the manager. The caller takes responsibility for deleting
7979
all returned annotations.
80-
\see annotations()
80+
.. seealso:: annotations()
8181
:rtype: list of QgsAnnotation
8282
%End
8383

8484
bool readXml( const QDomElement &element, const QDomDocument &doc );
8585
%Docstring
8686
Reads the manager's state from a DOM element, restoring all annotations
8787
present in the XML document.
88-
\see writeXml()
88+
.. seealso:: writeXml()
8989
:rtype: bool
9090
%End
9191

9292
QDomElement writeXml( QDomDocument &doc ) const;
9393
%Docstring
9494
Returns a DOM element representing the state of the manager.
95-
\see readXml()
95+
.. seealso:: readXml()
9696
:rtype: QDomElement
9797
%End
9898

python/core/annotations/qgshtmlannotation.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ class QgsHtmlAnnotation: QgsAnnotation
4040
void setSourceFile( const QString &htmlFile );
4141
%Docstring
4242
Sets the file path for the source HTML file.
43-
\see sourceFile()
43+
.. seealso:: sourceFile()
4444
%End
4545

4646
QString sourceFile() const;
4747
%Docstring
4848
Returns the file path for the source HTML file.
49-
\see setSourceFile()
49+
.. seealso:: setSourceFile()
5050
:rtype: str
5151
%End
5252

python/core/annotations/qgssvgannotation.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class QgsSvgAnnotation: QgsAnnotation
3535
void setFilePath( const QString &file );
3636
%Docstring
3737
Sets the file path for the source SVG file.
38-
\see filePath()
38+
.. seealso:: filePath()
3939
%End
4040

4141
QString filePath() const;
4242
%Docstring
4343
Returns the file path for the source SVG file.
44-
\see setFilePath()
44+
.. seealso:: setFilePath()
4545
:rtype: str
4646
%End
4747

python/core/annotations/qgstextannotation.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ class QgsTextAnnotation: QgsAnnotation
3333
%Docstring
3434
Returns the text document which will be rendered
3535
within the annotation.
36-
\see setDocument()
36+
.. seealso:: setDocument()
3737
:rtype: QTextDocument
3838
%End
3939

4040
void setDocument( const QTextDocument *doc );
4141
%Docstring
4242
Sets the text document which will be rendered
4343
within the annotation. Ownership is not transferred.
44-
\see document()
44+
.. seealso:: document()
4545
%End
4646

4747
virtual void writeXml( QDomElement &elem, QDomDocument &doc ) const;

python/core/geometry/qgsabstractgeometry.sip

+52-52
Original file line numberDiff line numberDiff line change
@@ -95,38 +95,38 @@ class QgsAbstractGeometry
9595
virtual QString geometryType() const = 0;
9696
%Docstring
9797
Returns a unique string representing the geometry type.
98-
\see wkbType
99-
\see wktTypeStr
98+
.. seealso:: wkbType
99+
.. seealso:: wktTypeStr
100100
:rtype: str
101101
%End
102102

103103
QgsWkbTypes::Type wkbType() const;
104104
%Docstring
105105
Returns the WKB type of the geometry.
106-
\see geometryType
107-
\see wktTypeStr
106+
.. seealso:: geometryType
107+
.. seealso:: wktTypeStr
108108
:rtype: QgsWkbTypes.Type
109109
%End
110110

111111
QString wktTypeStr() const;
112112
%Docstring
113113
Returns the WKT type string of the geometry.
114-
\see geometryType
115-
\see wkbType
114+
.. seealso:: geometryType
115+
.. seealso:: wkbType
116116
:rtype: str
117117
%End
118118

119119
bool is3D() const;
120120
%Docstring
121121
Returns true if the geometry is 3D and contains a z-value.
122-
\see isMeasure
122+
.. seealso:: isMeasure
123123
:rtype: bool
124124
%End
125125

126126
bool isMeasure() const;
127127
%Docstring
128128
Returns true if the geometry contains m values.
129-
\see is3D
129+
.. seealso:: is3D
130130
:rtype: bool
131131
%End
132132

@@ -145,25 +145,25 @@ class QgsAbstractGeometry
145145
%Docstring
146146
Sets the geometry from a WKB string.
147147
After successful read the wkb argument will be at the position where the reading has stopped.
148-
\see fromWkt
148+
.. seealso:: fromWkt
149149
:rtype: bool
150150
%End
151151

152152
virtual bool fromWkt( const QString &wkt ) = 0;
153153
%Docstring
154154
Sets the geometry from a WKT string.
155-
\see fromWkb
155+
.. seealso:: fromWkb
156156
:rtype: bool
157157
%End
158158

159159

160160
virtual QByteArray asWkb() const = 0;
161161
%Docstring
162162
Returns a WKB representation of the geometry.
163-
\see asWkt
164-
\see asGML2
165-
\see asGML3
166-
\see asJSON
163+
.. seealso:: asWkt
164+
.. seealso:: asGML2
165+
.. seealso:: asGML3
166+
.. seealso:: asJSON
167167
.. versionadded:: 3.0
168168
:rtype: QByteArray
169169
%End
@@ -172,10 +172,10 @@ class QgsAbstractGeometry
172172
%Docstring
173173
Returns a WKT representation of the geometry.
174174
\param precision number of decimal places for coordinates
175-
\see asWkb
176-
\see asGML2
177-
\see asGML3
178-
\see asJSON
175+
.. seealso:: asWkb
176+
.. seealso:: asGML2
177+
.. seealso:: asGML3
178+
.. seealso:: asJSON
179179
:rtype: str
180180
%End
181181

@@ -185,10 +185,10 @@ class QgsAbstractGeometry
185185
\param doc DOM document
186186
\param precision number of decimal places for coordinates
187187
\param ns XML namespace
188-
\see asWkb
189-
\see asWkt
190-
\see asGML3
191-
\see asJSON
188+
.. seealso:: asWkb
189+
.. seealso:: asWkt
190+
.. seealso:: asGML3
191+
.. seealso:: asJSON
192192
:rtype: QDomElement
193193
%End
194194

@@ -198,21 +198,21 @@ class QgsAbstractGeometry
198198
\param doc DOM document
199199
\param precision number of decimal places for coordinates
200200
\param ns XML namespace
201-
\see asWkb
202-
\see asWkt
203-
\see asGML2
204-
\see asJSON
201+
.. seealso:: asWkb
202+
.. seealso:: asWkt
203+
.. seealso:: asGML2
204+
.. seealso:: asJSON
205205
:rtype: QDomElement
206206
%End
207207

208208
virtual QString asJSON( int precision = 17 ) const = 0;
209209
%Docstring
210210
Returns a GeoJSON representation of the geometry.
211211
\param precision number of decimal places for coordinates
212-
\see asWkb
213-
\see asWkt
214-
\see asGML2
215-
\see asGML3
212+
.. seealso:: asWkb
213+
.. seealso:: asWkt
214+
.. seealso:: asGML2
215+
.. seealso:: asGML3
216216
:rtype: str
217217
%End
218218

@@ -295,8 +295,8 @@ class QgsAbstractGeometry
295295
\param position vertex id for position of inserted vertex
296296
\param vertex vertex to insert
297297
:return: true if insert was successful
298-
\see moveVertex
299-
\see deleteVertex
298+
.. seealso:: moveVertex
299+
.. seealso:: deleteVertex
300300
:rtype: bool
301301
%End
302302

@@ -306,8 +306,8 @@ class QgsAbstractGeometry
306306
\param position vertex id for vertex to move
307307
\param newPos new position of vertex
308308
:return: true if move was successful
309-
\see insertVertex
310-
\see deleteVertex
309+
.. seealso:: insertVertex
310+
.. seealso:: deleteVertex
311311
:rtype: bool
312312
%End
313313

@@ -316,32 +316,32 @@ class QgsAbstractGeometry
316316
Deletes a vertex within the geometry
317317
\param position vertex id for vertex to delete
318318
:return: true if delete was successful
319-
\see insertVertex
320-
\see moveVertex
319+
.. seealso:: insertVertex
320+
.. seealso:: moveVertex
321321
:rtype: bool
322322
%End
323323

324324
virtual double length() const;
325325
%Docstring
326326
Returns the length of the geometry.
327-
\see area()
328-
\see perimeter()
327+
.. seealso:: area()
328+
.. seealso:: perimeter()
329329
:rtype: float
330330
%End
331331

332332
virtual double perimeter() const;
333333
%Docstring
334334
Returns the perimeter of the geometry.
335-
\see area()
336-
\see length()
335+
.. seealso:: area()
336+
.. seealso:: length()
337337
:rtype: float
338338
%End
339339

340340
virtual double area() const;
341341
%Docstring
342342
Returns the area of the geometry.
343-
\see length()
344-
\see perimeter()
343+
.. seealso:: length()
344+
.. seealso:: perimeter()
345345
:rtype: float
346346
%End
347347

@@ -406,8 +406,8 @@ QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
406406
virtual int partCount() const = 0;
407407
%Docstring
408408
Returns count of parts contained in the geometry.
409-
\see vertexCount
410-
\see ringCount
409+
.. seealso:: vertexCount
410+
.. seealso:: ringCount
411411
:rtype: int
412412
%End
413413

@@ -417,8 +417,8 @@ QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
417417
\param zValue initial z-value for all nodes
418418
:return: true on success
419419
.. versionadded:: 2.12
420-
\see dropZValue()
421-
\see addMValue()
420+
.. seealso:: dropZValue()
421+
.. seealso:: addMValue()
422422
:rtype: bool
423423
%End
424424

@@ -428,17 +428,17 @@ QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
428428
\param mValue initial m-value for all nodes
429429
:return: true on success
430430
.. versionadded:: 2.12
431-
\see dropMValue()
432-
\see addZValue()
431+
.. seealso:: dropMValue()
432+
.. seealso:: addZValue()
433433
:rtype: bool
434434
%End
435435

436436
virtual bool dropZValue() = 0;
437437
%Docstring
438438
Drops any z-dimensions which exist in the geometry.
439439
:return: true if Z values were present and have been removed
440-
\see addZValue()
441-
\see dropMValue()
440+
.. seealso:: addZValue()
441+
.. seealso:: dropMValue()
442442
.. versionadded:: 2.14
443443
:rtype: bool
444444
%End
@@ -447,8 +447,8 @@ QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
447447
%Docstring
448448
Drops any measure values which exist in the geometry.
449449
:return: true if m-values were present and have been removed
450-
\see addMValue()
451-
\see dropZValue()
450+
.. seealso:: addMValue()
451+
.. seealso:: dropZValue()
452452
.. versionadded:: 2.14
453453
:rtype: bool
454454
%End

0 commit comments

Comments
 (0)