Skip to content

Commit d4edbc0

Browse files
committed
Unsipify QgsMargins
1 parent 7ac276e commit d4edbc0

File tree

3 files changed

+89
-21
lines changed

3 files changed

+89
-21
lines changed

python/auto_sip.blacklist

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ core/qgsexception.sip
33
core/qgis.sip
44
core/qgsexpressioncontext.sip
55
core/qgsfeaturerequest.sip
6+
core/qgsmargins.sip
67
core/qgsoptionalexpression.sip
78
core/qgspaintenginehack.sip
89
core/qgspainting.sip

python/core/qgsmargins.sip

+88-19
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
/************************************************************************
2-
* This file has been generated automatically from *
3-
* *
4-
* src/core/qgsmargins.h *
5-
* *
6-
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7-
************************************************************************/
8-
9-
10-
11-
12-
131
class QgsMargins
142
{
153

@@ -149,10 +137,91 @@ class QgsMargins
149137
};
150138

151139

152-
/************************************************************************
153-
* This file has been generated automatically from *
154-
* *
155-
* src/core/qgsmargins.h *
156-
* *
157-
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
158-
************************************************************************/
140+
bool operator==( const QgsMargins &lhs, const QgsMargins &rhs );
141+
%Docstring
142+
Returns \c true if ``lhs`` and ``rhs`` are equal; otherwise returns \c false.
143+
:rtype: bool
144+
%End
145+
146+
bool operator!=( const QgsMargins &lhs, const QgsMargins &rhs );
147+
%Docstring
148+
Returns \c true if ``lhs`` and ``rhs`` are different; otherwise returns \c false.
149+
:rtype: bool
150+
%End
151+
152+
QgsMargins operator+( const QgsMargins &m1, const QgsMargins &m2 );
153+
%Docstring
154+
Returns a QgsMargins object that is the sum of the given margins, ``m1``
155+
and ``m2``; each component is added separately.
156+
:rtype: QgsMargins
157+
%End
158+
159+
QgsMargins operator-( const QgsMargins &m1, const QgsMargins &m2 );
160+
%Docstring
161+
Returns a QgsMargins object that is formed by subtracting ``m2`` from
162+
``m1``; each component is subtracted separately.
163+
:rtype: QgsMargins
164+
%End
165+
166+
QgsMargins operator+( const QgsMargins &lhs, double rhs );
167+
%Docstring
168+
Returns a QgsMargins object that is formed by adding ``rhs`` to ``lhs``.
169+
:rtype: QgsMargins
170+
%End
171+
172+
QgsMargins operator+( double lhs, const QgsMargins &rhs );
173+
%Docstring
174+
Returns a QgsMargins object that is formed by adding ``lhs`` to ``rhs``.
175+
:rtype: QgsMargins
176+
%End
177+
178+
QgsMargins operator-( const QgsMargins &lhs, double rhs );
179+
%Docstring
180+
Returns a QgsMargins object that is formed by subtracting ``rhs`` from ``lhs``.
181+
:rtype: QgsMargins
182+
%End
183+
184+
QgsMargins operator*( const QgsMargins &margins, double factor );
185+
%Docstring
186+
Returns a QgsMargins object that is formed by multiplying each component
187+
of the given ``margins`` by ``factor``.
188+
:rtype: QgsMargins
189+
%End
190+
191+
QgsMargins operator*( double factor, const QgsMargins &margins );
192+
%Docstring
193+
Returns a QgsMargins object that is formed by multiplying each component
194+
of the given ``margins`` by ``factor``.
195+
:rtype: QgsMargins
196+
%End
197+
198+
QgsMargins operator/( const QgsMargins &margins, double divisor );
199+
%Docstring
200+
Returns a QgsMargins object that is formed by dividing the components of
201+
the given ``margins`` by the given ``divisor``.
202+
:rtype: QgsMargins
203+
%End
204+
205+
QgsMargins &QgsMargins::operator+=( const QgsMargins &margins );
206+
207+
QgsMargins &QgsMargins::operator-=( const QgsMargins &margins );
208+
209+
QgsMargins &QgsMargins::operator+=( double addend );
210+
211+
QgsMargins &QgsMargins::operator-=( double subtrahend );
212+
213+
QgsMargins &QgsMargins::operator*=( double factor );
214+
215+
QgsMargins &QgsMargins::operator/=( double divisor );
216+
217+
QgsMargins operator+( const QgsMargins &margins );
218+
%Docstring
219+
Returns a QgsMargins object that is formed from all components of ``margins``.
220+
:rtype: QgsMargins
221+
%End
222+
223+
QgsMargins operator-( const QgsMargins &margins );
224+
%Docstring
225+
Returns a QgsMargins object that is formed by negating all components of ``margins``.
226+
:rtype: QgsMargins
227+
%End

src/core/qgsmargins.h

-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ class CORE_EXPORT QgsMargins
168168
double mBottom = 0.0;
169169
};
170170

171-
#ifndef SIP_RUN
172171

173172
/**
174173
* Returns \c true if \a lhs and \a rhs are equal; otherwise returns \c false.
@@ -321,6 +320,5 @@ inline QgsMargins operator-( const QgsMargins &margins )
321320
}
322321

323322
Q_DECLARE_TYPEINFO( QgsMargins, Q_MOVABLE_TYPE );
324-
#endif
325323

326324
#endif // QGSMARGINS_H

0 commit comments

Comments
 (0)