Skip to content

Commit ad7ce98

Browse files
m-kuhnm-kuhn
committedMay 19, 2017
Update sip files
·
ltr-3_40final-3_0_0
1 parent b789cc3 commit ad7ce98

File tree

6 files changed

+104
-21
lines changed

6 files changed

+104
-21
lines changed
 

‎python/core/expression/qgsexpression.sip

Lines changed: 0 additions & 7 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

‎python/core/expression/qgsexpressionfunction.sip

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ Returns the default value for the parameter.
6464
%End
6565

6666
bool operator==( const QgsExpressionFunction::Parameter &other ) const;
67-
%Docstring
68-
:rtype: bool
69-
%End
7067

7168
};
7269

@@ -253,9 +250,6 @@ The help text for the function.
253250
%End
254251

255252
bool operator==( const QgsExpressionFunction &other ) const;
256-
%Docstring
257-
:rtype: bool
258-
%End
259253

260254
virtual bool handlesNull() const;
261255
%Docstring

‎python/core/expression/qgsexpressionnode.sip

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ Node
8787
};
8888

8989
class NodeList
90-
{
90+
{
91+
92+
%TypeHeaderCode
93+
#include "qgsexpressionnode.h"
94+
%End
9195
public:
9296
virtual ~NodeList();
9397
void append( QgsExpressionNode *node /Transfer/ );

‎python/core/qgsfeaturerequest.sip

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,23 +208,24 @@ class QgsFeatureRequest
208208
%End
209209
public:
210210

211-
OrderBy();
211+
CORE_EXPORT OrderBy();
212212
%Docstring
213213
Create a new empty order by
214+
:rtype: CORE_EXPORT
214215
%End
215216

216-
OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
217+
CORE_EXPORT OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
217218
%Docstring
218219
Create a new order by from a list of clauses
220+
:rtype: CORE_EXPORT
219221
%End
220222

221-
QList<QgsFeatureRequest::OrderByClause> list() const;
223+
QList<QgsFeatureRequest::OrderByClause> CORE_EXPORT list() const;
222224
%Docstring
223225
Get a copy as a list of OrderByClauses
224226

225227
This is only required in Python where the inheritance
226228
is not properly propagated and this makes it usable.
227-
:rtype: list of QgsFeatureRequest.OrderByClause
228229
%End
229230

230231
void save( QDomElement &elem ) const;
@@ -240,13 +241,11 @@ class QgsFeatureRequest
240241
QSet<QString> usedAttributes() const;
241242
%Docstring
242243
Returns a set of used attributes
243-
:rtype: set of str
244244
%End
245245

246246
QString dump() const;
247247
%Docstring
248248
Dumps the content to an SQL equivalent syntax
249-
:rtype: str
250249
%End
251250
};
252251

‎python/gui/qgsvertexmarker.sip

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsvertexmarker.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
class QgsVertexMarker : QgsMapCanvasItem
13+
{
14+
%Docstring
15+
A class for marking vertices of features using e.g. circles or 'x'.
16+
%End
17+
18+
%TypeHeaderCode
19+
#include "qgsvertexmarker.h"
20+
%End
21+
public:
22+
23+
enum IconType
24+
{
25+
ICON_NONE,
26+
ICON_CROSS,
27+
ICON_X,
28+
ICON_BOX,
29+
ICON_CIRCLE
30+
};
31+
32+
QgsVertexMarker( QgsMapCanvas *mapCanvas /TransferThis/ );
33+
34+
void setCenter( const QgsPoint &point );
35+
36+
void setIconType( int iconType );
37+
38+
void setIconSize( int iconSize );
39+
40+
void setColor( const QColor &color );
41+
%Docstring
42+
Sets the stroke ``color`` for the marker.
43+
.. seealso:: color()
44+
.. seealso:: setFillColor()
45+
%End
46+
47+
QColor color() const;
48+
%Docstring
49+
Returns the stroke color for the marker.
50+
.. seealso:: setColor()
51+
.. seealso:: fillColor()
52+
.. versionadded:: 3.0
53+
:rtype: QColor
54+
%End
55+
56+
void setFillColor( const QColor &color );
57+
%Docstring
58+
Sets the fill ``color`` for the marker. This setting only
59+
applies to some icon types.
60+
.. versionadded:: 3.0
61+
.. seealso:: fillColor()
62+
.. seealso:: setColor()
63+
%End
64+
65+
QColor fillColor() const;
66+
%Docstring
67+
Returns the fill ``color`` for the marker. This setting only
68+
applies to some icon types.
69+
.. versionadded:: 3.0
70+
.. seealso:: setFillColor()
71+
.. seealso:: color()
72+
:rtype: QColor
73+
%End
74+
75+
void setPenWidth( int width );
76+
77+
virtual void paint( QPainter *p );
78+
79+
80+
virtual QRectF boundingRect() const;
81+
82+
83+
virtual void updatePosition();
84+
85+
};
86+
87+
/************************************************************************
88+
* This file has been generated automatically from *
89+
* *
90+
* src/gui/qgsvertexmarker.h *
91+
* *
92+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
93+
************************************************************************/

‎src/core/expression/qgsexpressionnode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class CORE_EXPORT QgsExpressionNode SIP_ABSTRACT
106106

107107
/** \ingroup core
108108
*/
109-
class NodeList
109+
class CORE_EXPORT NodeList
110110
{
111111
public:
112112
virtual ~NodeList();

0 commit comments

Comments
 (0)
Please sign in to comment.