Skip to content

Commit 8231d75

Browse files
committedMay 17, 2017
sipify QgsExpressionContext, QgsFeatureRequest, QgsOptionalExpression
1 parent afc9788 commit 8231d75

30 files changed

+1382
-852
lines changed
 

‎python/auto_sip.blacklist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
core/conversions.sip
22
core/qgsexception.sip
33
core/qgis.sip
4-
core/qgsexpressioncontext.sip
5-
core/qgsfeaturerequest.sip
6-
core/qgsoptionalexpression.sip
74
core/qgspaintenginehack.sip
85
core/qgspainting.sip
96
core/qgspallabeling.sip

‎python/core/geometry/qgsabstractgeometry.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,6 @@ struct QgsVertexId
498498
%End
499499

500500
bool operator==( QgsVertexId other ) const;
501-
%Docstring
502-
:rtype: bool
503-
%End
504501
bool operator!=( QgsVertexId other ) const;
505502
%Docstring
506503
:rtype: bool

‎python/core/geometry/qgscurve.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ class QgsCurve: QgsAbstractGeometry
2424
QgsCurve();
2525

2626
virtual bool operator==( const QgsCurve &other ) const = 0;
27-
%Docstring
28-
:rtype: bool
29-
%End
3027
virtual bool operator!=( const QgsCurve &other ) const = 0;
3128
%Docstring
3229
:rtype: bool

‎python/core/geometry/qgspointv2.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ class QgsPointV2: QgsAbstractGeometry
6262
%End
6363

6464
bool operator==( const QgsPointV2 &pt ) const;
65-
%Docstring
66-
:rtype: bool
67-
%End
6865
bool operator!=( const QgsPointV2 &pt ) const;
6966
%Docstring
7067
:rtype: bool

‎python/core/geometry/qgspolygon.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class QgsPolygonV2: QgsCurvePolygon
2323
QgsPolygonV2();
2424

2525
bool operator==( const QgsPolygonV2 &other ) const;
26-
%Docstring
27-
:rtype: bool
28-
%End
2926
bool operator!=( const QgsPolygonV2 &other ) const;
3027
%Docstring
3128
:rtype: bool

‎python/core/geometry/qgsrectangle.sip

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@ Copy constructor
258258
%End
259259

260260
bool operator==( const QgsRectangle &r1 ) const;
261-
%Docstring
262-
Comparison operator
263-
:return: True if rectangles are equal
264-
:rtype: bool
265-
%End
266261

267262
bool operator!=( const QgsRectangle &r1 ) const;
268263
%Docstring

‎python/core/geometry/qgstriangle.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ class QgsTriangle : QgsPolygonV2
5050
%End
5151

5252
bool operator==( const QgsTriangle &other ) const;
53-
%Docstring
54-
:rtype: bool
55-
%End
5653
bool operator!=( const QgsTriangle &other ) const;
5754
%Docstring
5855
:rtype: bool

‎python/core/qgsactionscope.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ class QgsActionScope
5252
%End
5353

5454
bool operator==( const QgsActionScope &other ) const;
55-
%Docstring
56-
Compares two action scopes
57-
:rtype: bool
58-
%End
5955

6056
QgsExpressionContextScope expressionContextScope() const;
6157
%Docstring

‎python/core/qgscolorramp.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ Gradient color at stop
113113
%End
114114

115115
bool operator==( const QgsGradientStop &other ) const;
116-
%Docstring
117-
:rtype: bool
118-
%End
119116
};
120117

121118
typedef QList<QgsGradientStop> QgsGradientStopsList;

‎python/core/qgscoordinatereferencesystem.sip

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,12 +463,6 @@ Returns whether this CRS is correctly initialized and usable
463463
%End
464464

465465
bool operator==( const QgsCoordinateReferenceSystem &srs ) const;
466-
%Docstring
467-
Overloaded == operator used to compare to CRS's.
468-
469-
Internally it will use authid() for comparison.
470-
:rtype: bool
471-
%End
472466

473467
bool operator!=( const QgsCoordinateReferenceSystem &srs ) const;
474468
%Docstring

‎python/core/qgseditformconfig.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ class QgsEditFormConfig
6868

6969

7070
bool operator==( const QgsEditFormConfig &o );
71-
%Docstring
72-
:rtype: bool
73-
%End
7471

7572
void addTab( QgsAttributeEditorElement *data /Transfer/ );
7673
%Docstring

‎python/core/qgsexpression.sip

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ Implicit sharing was added in 2.14
108108
~QgsExpression();
109109

110110
bool operator==( const QgsExpression &other ) const;
111-
%Docstring
112-
Compares two expressions. The operator returns true
113-
if the expression string is equal.
114-
115-
.. versionadded:: 3.0
116-
:rtype: bool
117-
%End
118111

119112
bool isValid() const;
120113
%Docstring
@@ -456,9 +449,6 @@ Returns the default value for the parameter.
456449
%End
457450

458451
bool operator==( const QgsExpression::Parameter &other ) const;
459-
%Docstring
460-
:rtype: bool
461-
%End
462452

463453
};
464454

@@ -658,9 +648,6 @@ The help text for the function.
658648
%End
659649

660650
bool operator==( const QgsExpression::Function &other ) const;
661-
%Docstring
662-
:rtype: bool
663-
%End
664651

665652
virtual bool handlesNull() const;
666653
%Docstring

0 commit comments

Comments
 (0)