1 |
commit: 072218d4f057afb1f5a5e02d3b84968fa913d8e6 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 17:38:15 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 30 17:38:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072218d4 |
7 |
|
8 |
media-gfx/valentina: updated |
9 |
|
10 |
1) eapi7 |
11 |
2) moved from xdg-utils to xdg |
12 |
3) removed new patch from the repo due to the size |
13 |
4) removed gnome use flag |
14 |
|
15 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
16 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
17 |
|
18 |
media-gfx/valentina/Manifest | 1 + |
19 |
media-gfx/valentina/files/5858.patch | 1495 -------------------- |
20 |
...tina-0.6.1.ebuild => valentina-0.6.1-r1.ebuild} | 20 +- |
21 |
media-gfx/valentina/valentina-9999.ebuild | 17 +- |
22 |
4 files changed, 11 insertions(+), 1522 deletions(-) |
23 |
|
24 |
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest |
25 |
index 7e3b734a2bb..6f5a9f26ddd 100644 |
26 |
--- a/media-gfx/valentina/Manifest |
27 |
+++ b/media-gfx/valentina/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce |
30 |
+DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 |
31 |
|
32 |
diff --git a/media-gfx/valentina/files/5858.patch b/media-gfx/valentina/files/5858.patch |
33 |
deleted file mode 100644 |
34 |
index b24d89eb8e1..00000000000 |
35 |
--- a/media-gfx/valentina/files/5858.patch |
36 |
+++ /dev/null |
37 |
@@ -1,1495 +0,0 @@ |
38 |
-# HG changeset patch |
39 |
-# User Roman Telezhynskyi <kroluku@×××××.com> |
40 |
-# Date 1577703657 -7200 |
41 |
-# Mon Dec 30 13:00:57 2019 +0200 |
42 |
-# Branch release |
43 |
-# Node ID fb8691f522f3515d7c3014a0ea90b60b352a444e |
44 |
-# Parent 065a26d8b5779ca5c8c2486509352c8c48190a33 |
45 |
-Fix move sematic. |
46 |
- |
47 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/qmuparser/qmuparsercallback.cpp |
48 |
---- a/src/libs/qmuparser/qmuparsercallback.cpp Sun Dec 29 14:37:46 2019 +0200 |
49 |
-+++ b/src/libs/qmuparser/qmuparsercallback.cpp Mon Dec 30 13:00:57 2019 +0200 |
50 |
-@@ -208,6 +208,21 @@ |
51 |
- return *this; |
52 |
- } |
53 |
- |
54 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
55 |
-+//--------------------------------------------------------------------------------------------------------------------- |
56 |
-+QmuParserCallback &QmuParserCallback::operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW |
57 |
-+{ |
58 |
-+ Swap(a_Fun); |
59 |
-+ return *this; |
60 |
-+} |
61 |
-+#endif |
62 |
-+ |
63 |
-+//--------------------------------------------------------------------------------------------------------------------- |
64 |
-+void QmuParserCallback::Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW |
65 |
-+{ |
66 |
-+ std::swap(d, a_Fun.d); |
67 |
-+} |
68 |
-+ |
69 |
- //--------------------------------------------------------------------------------------------------------------------- |
70 |
- /** |
71 |
- * @brief Return true if the function is conservative. |
72 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/qmuparser/qmuparsercallback.h |
73 |
---- a/src/libs/qmuparser/qmuparsercallback.h Sun Dec 29 14:37:46 2019 +0200 |
74 |
-+++ b/src/libs/qmuparser/qmuparsercallback.h Mon Dec 30 13:00:57 2019 +0200 |
75 |
-@@ -86,11 +86,10 @@ |
76 |
- QmuParserCallback &operator=(const QmuParserCallback &a_Fun); |
77 |
- |
78 |
- #ifdef Q_COMPILER_RVALUE_REFS |
79 |
-- QmuParserCallback &operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW { Swap(a_Fun); return *this; } |
80 |
-+ QmuParserCallback &operator=(QmuParserCallback &&a_Fun) Q_DECL_NOTHROW; |
81 |
- #endif |
82 |
- |
83 |
-- inline void Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW |
84 |
-- { std::swap(d, a_Fun.d); } |
85 |
-+ void Swap(QmuParserCallback &a_Fun) Q_DECL_NOTHROW; |
86 |
- |
87 |
- Q_REQUIRED_RESULT QmuParserCallback* Clone() const; |
88 |
- |
89 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractarc.cpp |
90 |
---- a/src/libs/vgeometry/vabstractarc.cpp Sun Dec 29 14:37:46 2019 +0200 |
91 |
-+++ b/src/libs/vgeometry/vabstractarc.cpp Mon Dec 30 13:00:57 2019 +0200 |
92 |
-@@ -78,6 +78,22 @@ |
93 |
- return *this; |
94 |
- } |
95 |
- |
96 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
97 |
-+//--------------------------------------------------------------------------------------------------------------------- |
98 |
-+VAbstractArc &VAbstractArc::operator=(VAbstractArc &&arc) Q_DECL_NOTHROW |
99 |
-+{ |
100 |
-+ Swap(arc); |
101 |
-+ return *this; |
102 |
-+} |
103 |
-+#endif |
104 |
-+ |
105 |
-+//--------------------------------------------------------------------------------------------------------------------- |
106 |
-+void VAbstractArc::Swap(VAbstractArc &arc) Q_DECL_NOTHROW |
107 |
-+{ |
108 |
-+ VAbstractCurve::Swap(arc); |
109 |
-+ std::swap(d, arc.d); |
110 |
-+} |
111 |
-+ |
112 |
- //--------------------------------------------------------------------------------------------------------------------- |
113 |
- VAbstractArc::~VAbstractArc() |
114 |
- {} |
115 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractarc.h |
116 |
---- a/src/libs/vgeometry/vabstractarc.h Sun Dec 29 14:37:46 2019 +0200 |
117 |
-+++ b/src/libs/vgeometry/vabstractarc.h Mon Dec 30 13:00:57 2019 +0200 |
118 |
-@@ -58,11 +58,10 @@ |
119 |
- |
120 |
- VAbstractArc& operator= (const VAbstractArc &arc); |
121 |
- #ifdef Q_COMPILER_RVALUE_REFS |
122 |
-- VAbstractArc &operator=(VAbstractArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } |
123 |
-+ VAbstractArc &operator=(VAbstractArc &&arc) Q_DECL_NOTHROW; |
124 |
- #endif |
125 |
- |
126 |
-- inline void Swap(VAbstractArc &arc) Q_DECL_NOTHROW |
127 |
-- { VAbstractCurve::Swap(arc); std::swap(d, arc.d); } |
128 |
-+ void Swap(VAbstractArc &arc) Q_DECL_NOTHROW; |
129 |
- |
130 |
- QString GetFormulaF1 () const; |
131 |
- void SetFormulaF1 (const QString &formula, qreal value); |
132 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractcurve.cpp |
133 |
---- a/src/libs/vgeometry/vabstractcurve.cpp Sun Dec 29 14:37:46 2019 +0200 |
134 |
-+++ b/src/libs/vgeometry/vabstractcurve.cpp Mon Dec 30 13:00:57 2019 +0200 |
135 |
-@@ -59,6 +59,22 @@ |
136 |
- return *this; |
137 |
- } |
138 |
- |
139 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
140 |
-+//--------------------------------------------------------------------------------------------------------------------- |
141 |
-+VAbstractCurve &VAbstractCurve::operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW |
142 |
-+{ |
143 |
-+ Swap(curve); |
144 |
-+ return *this; |
145 |
-+} |
146 |
-+#endif |
147 |
-+ |
148 |
-+//--------------------------------------------------------------------------------------------------------------------- |
149 |
-+void VAbstractCurve::Swap(VAbstractCurve &curve) Q_DECL_NOTHROW |
150 |
-+{ |
151 |
-+ VGObject::Swap(curve); |
152 |
-+ std::swap(d, curve.d); |
153 |
-+} |
154 |
-+ |
155 |
- //--------------------------------------------------------------------------------------------------------------------- |
156 |
- VAbstractCurve::~VAbstractCurve() |
157 |
- {} |
158 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vabstractcurve.h |
159 |
---- a/src/libs/vgeometry/vabstractcurve.h Sun Dec 29 14:37:46 2019 +0200 |
160 |
-+++ b/src/libs/vgeometry/vabstractcurve.h Mon Dec 30 13:00:57 2019 +0200 |
161 |
-@@ -57,11 +57,10 @@ |
162 |
- |
163 |
- VAbstractCurve& operator= (const VAbstractCurve &curve); |
164 |
- #ifdef Q_COMPILER_RVALUE_REFS |
165 |
-- VAbstractCurve &operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } |
166 |
-+ VAbstractCurve &operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW; |
167 |
- #endif |
168 |
- |
169 |
-- inline void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW |
170 |
-- { VGObject::Swap(curve); std::swap(d, curve.d); } |
171 |
-+ void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW; |
172 |
- |
173 |
- virtual QVector<QPointF> GetPoints() const =0; |
174 |
- static QVector<QPointF> GetSegmentPoints(const QVector<QPointF> &points, const QPointF &begin, const QPointF &end, |
175 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/varc.cpp |
176 |
---- a/src/libs/vgeometry/varc.cpp Sun Dec 29 14:37:46 2019 +0200 |
177 |
-+++ b/src/libs/vgeometry/varc.cpp Mon Dec 30 13:00:57 2019 +0200 |
178 |
-@@ -116,6 +116,23 @@ |
179 |
- return *this; |
180 |
- } |
181 |
- |
182 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
183 |
-+//--------------------------------------------------------------------------------------------------------------------- |
184 |
-+VArc &VArc::operator=(VArc &&arc) Q_DECL_NOTHROW |
185 |
-+{ |
186 |
-+ Swap(arc); |
187 |
-+ return *this; |
188 |
-+} |
189 |
-+#endif |
190 |
-+ |
191 |
-+ |
192 |
-+//--------------------------------------------------------------------------------------------------------------------- |
193 |
-+inline void VArc::Swap(VArc &arc) Q_DECL_NOTHROW |
194 |
-+{ |
195 |
-+ VAbstractArc::Swap(arc); |
196 |
-+ std::swap(d, arc.d); |
197 |
-+} |
198 |
-+ |
199 |
- //--------------------------------------------------------------------------------------------------------------------- |
200 |
- VArc VArc::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const |
201 |
- { |
202 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/varc.h |
203 |
---- a/src/libs/vgeometry/varc.h Sun Dec 29 14:37:46 2019 +0200 |
204 |
-+++ b/src/libs/vgeometry/varc.h Mon Dec 30 13:00:57 2019 +0200 |
205 |
-@@ -66,11 +66,10 @@ |
206 |
- |
207 |
- VArc& operator= (const VArc &arc); |
208 |
- #ifdef Q_COMPILER_RVALUE_REFS |
209 |
-- VArc &operator=(VArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } |
210 |
-+ VArc &operator=(VArc &&arc) Q_DECL_NOTHROW; |
211 |
- #endif |
212 |
- |
213 |
-- inline void Swap(VArc &arc) Q_DECL_NOTHROW |
214 |
-- { VAbstractArc::Swap(arc); std::swap(d, arc.d); } |
215 |
-+ void Swap(VArc &arc) Q_DECL_NOTHROW; |
216 |
- |
217 |
- QString GetFormulaRadius () const; |
218 |
- void SetFormulaRadius (const QString &formula, qreal value); |
219 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezier.cpp |
220 |
---- a/src/libs/vgeometry/vcubicbezier.cpp Sun Dec 29 14:37:46 2019 +0200 |
221 |
-+++ b/src/libs/vgeometry/vcubicbezier.cpp Mon Dec 30 13:00:57 2019 +0200 |
222 |
-@@ -64,6 +64,22 @@ |
223 |
- return *this; |
224 |
- } |
225 |
- |
226 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
227 |
-+//--------------------------------------------------------------------------------------------------------------------- |
228 |
-+VCubicBezier &VCubicBezier::operator=(VCubicBezier &&curve) Q_DECL_NOTHROW |
229 |
-+{ |
230 |
-+ Swap(curve); |
231 |
-+ return *this; |
232 |
-+} |
233 |
-+#endif |
234 |
-+ |
235 |
-+//--------------------------------------------------------------------------------------------------------------------- |
236 |
-+void VCubicBezier::Swap(VCubicBezier &curve) Q_DECL_NOTHROW |
237 |
-+{ |
238 |
-+ VAbstractCubicBezier::Swap(curve); |
239 |
-+ std::swap(d, curve.d); |
240 |
-+} |
241 |
-+ |
242 |
- //--------------------------------------------------------------------------------------------------------------------- |
243 |
- VCubicBezier VCubicBezier::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const |
244 |
- { |
245 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezier.h |
246 |
---- a/src/libs/vgeometry/vcubicbezier.h Sun Dec 29 14:37:46 2019 +0200 |
247 |
-+++ b/src/libs/vgeometry/vcubicbezier.h Mon Dec 30 13:00:57 2019 +0200 |
248 |
-@@ -57,11 +57,10 @@ |
249 |
- |
250 |
- VCubicBezier &operator=(const VCubicBezier &curve); |
251 |
- #ifdef Q_COMPILER_RVALUE_REFS |
252 |
-- VCubicBezier &operator=(VCubicBezier &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } |
253 |
-+ VCubicBezier &operator=(VCubicBezier &&curve) Q_DECL_NOTHROW; |
254 |
- #endif |
255 |
- |
256 |
-- inline void Swap(VCubicBezier &curve) Q_DECL_NOTHROW |
257 |
-- { VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); } |
258 |
-+ void Swap(VCubicBezier &curve) Q_DECL_NOTHROW; |
259 |
- |
260 |
- virtual VPointF GetP1() const override; |
261 |
- void SetP1(const VPointF &p); |
262 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezierpath.cpp |
263 |
---- a/src/libs/vgeometry/vcubicbezierpath.cpp Sun Dec 29 14:37:46 2019 +0200 |
264 |
-+++ b/src/libs/vgeometry/vcubicbezierpath.cpp Mon Dec 30 13:00:57 2019 +0200 |
265 |
-@@ -78,6 +78,22 @@ |
266 |
- return *this; |
267 |
- } |
268 |
- |
269 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
270 |
-+//--------------------------------------------------------------------------------------------------------------------- |
271 |
-+VCubicBezierPath &VCubicBezierPath::operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW |
272 |
-+{ |
273 |
-+ Swap(curve); |
274 |
-+ return *this; |
275 |
-+} |
276 |
-+#endif |
277 |
-+ |
278 |
-+//--------------------------------------------------------------------------------------------------------------------- |
279 |
-+void VCubicBezierPath::Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW |
280 |
-+{ |
281 |
-+ VAbstractCubicBezierPath::Swap(curve); |
282 |
-+ std::swap(d, curve.d); |
283 |
-+} |
284 |
-+ |
285 |
- //--------------------------------------------------------------------------------------------------------------------- |
286 |
- VCubicBezierPath VCubicBezierPath::Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix) const |
287 |
- { |
288 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vcubicbezierpath.h |
289 |
---- a/src/libs/vgeometry/vcubicbezierpath.h Sun Dec 29 14:37:46 2019 +0200 |
290 |
-+++ b/src/libs/vgeometry/vcubicbezierpath.h Mon Dec 30 13:00:57 2019 +0200 |
291 |
-@@ -58,11 +58,10 @@ |
292 |
- |
293 |
- VCubicBezierPath &operator=(const VCubicBezierPath &curve); |
294 |
- #ifdef Q_COMPILER_RVALUE_REFS |
295 |
-- VCubicBezierPath &operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } |
296 |
-+ VCubicBezierPath &operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW; |
297 |
- #endif |
298 |
- |
299 |
-- inline void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW |
300 |
-- { VAbstractCubicBezierPath::Swap(curve); std::swap(d, curve.d); } |
301 |
-+ void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW; |
302 |
- |
303 |
- VPointF &operator[](int indx); |
304 |
- |
305 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vellipticalarc.cpp |
306 |
---- a/src/libs/vgeometry/vellipticalarc.cpp Sun Dec 29 14:37:46 2019 +0200 |
307 |
-+++ b/src/libs/vgeometry/vellipticalarc.cpp Mon Dec 30 13:00:57 2019 +0200 |
308 |
-@@ -123,6 +123,22 @@ |
309 |
- return *this; |
310 |
- } |
311 |
- |
312 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
313 |
-+//--------------------------------------------------------------------------------------------------------------------- |
314 |
-+VEllipticalArc &VEllipticalArc::operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW |
315 |
-+{ |
316 |
-+ Swap(arc); |
317 |
-+ return *this; |
318 |
-+} |
319 |
-+#endif |
320 |
-+ |
321 |
-+//--------------------------------------------------------------------------------------------------------------------- |
322 |
-+void VEllipticalArc::Swap(VEllipticalArc &arc) Q_DECL_NOTHROW |
323 |
-+{ |
324 |
-+ VAbstractArc::Swap(arc); |
325 |
-+ std::swap(d, arc.d); |
326 |
-+} |
327 |
-+ |
328 |
- //--------------------------------------------------------------------------------------------------------------------- |
329 |
- VEllipticalArc VEllipticalArc::Rotate(QPointF originPoint, qreal degrees, const QString &prefix) const |
330 |
- { |
331 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vellipticalarc.h |
332 |
---- a/src/libs/vgeometry/vellipticalarc.h Sun Dec 29 14:37:46 2019 +0200 |
333 |
-+++ b/src/libs/vgeometry/vellipticalarc.h Mon Dec 30 13:00:57 2019 +0200 |
334 |
-@@ -69,11 +69,10 @@ |
335 |
- |
336 |
- VEllipticalArc& operator= (const VEllipticalArc &arc); |
337 |
- #ifdef Q_COMPILER_RVALUE_REFS |
338 |
-- VEllipticalArc &operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } |
339 |
-+ VEllipticalArc &operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW; |
340 |
- #endif |
341 |
- |
342 |
-- inline void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW |
343 |
-- { VAbstractArc::Swap(arc); std::swap(d, arc.d); } |
344 |
-+ void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW; |
345 |
- |
346 |
- QString GetFormulaRotationAngle () const; |
347 |
- void SetFormulaRotationAngle (const QString &formula, qreal value); |
348 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vgobject.cpp |
349 |
---- a/src/libs/vgeometry/vgobject.cpp Sun Dec 29 14:37:46 2019 +0200 |
350 |
-+++ b/src/libs/vgeometry/vgobject.cpp Mon Dec 30 13:00:57 2019 +0200 |
351 |
-@@ -84,6 +84,22 @@ |
352 |
- return *this; |
353 |
- } |
354 |
- |
355 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
356 |
-+ |
357 |
-+//--------------------------------------------------------------------------------------------------------------------- |
358 |
-+VGObject &VGObject::operator=(VGObject &&obj) Q_DECL_NOTHROW |
359 |
-+{ |
360 |
-+ Swap(obj); |
361 |
-+ return *this; |
362 |
-+} |
363 |
-+#endif |
364 |
-+ |
365 |
-+//--------------------------------------------------------------------------------------------------------------------- |
366 |
-+void VGObject::Swap(VGObject &obj) Q_DECL_NOTHROW |
367 |
-+{ |
368 |
-+ std::swap(d, obj.d); |
369 |
-+} |
370 |
-+ |
371 |
- //--------------------------------------------------------------------------------------------------------------------- |
372 |
- VGObject::~VGObject() |
373 |
- {} |
374 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vgobject.h |
375 |
---- a/src/libs/vgeometry/vgobject.h Sun Dec 29 14:37:46 2019 +0200 |
376 |
-+++ b/src/libs/vgeometry/vgobject.h Mon Dec 30 13:00:57 2019 +0200 |
377 |
-@@ -59,11 +59,10 @@ |
378 |
- |
379 |
- VGObject& operator= (const VGObject &obj); |
380 |
- #ifdef Q_COMPILER_RVALUE_REFS |
381 |
-- VGObject &operator=(VGObject &&obj) Q_DECL_NOTHROW { Swap(obj); return *this; } |
382 |
-+ VGObject &operator=(VGObject &&obj) Q_DECL_NOTHROW; |
383 |
- #endif |
384 |
- |
385 |
-- inline void Swap(VGObject &obj) Q_DECL_NOTHROW |
386 |
-- { std::swap(d, obj.d); } |
387 |
-+ void Swap(VGObject &obj) Q_DECL_NOTHROW; |
388 |
- |
389 |
- quint32 getIdObject() const; |
390 |
- void setIdObject(const quint32 &value); |
391 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vplacelabelitem.cpp |
392 |
---- a/src/libs/vgeometry/vplacelabelitem.cpp Sun Dec 29 14:37:46 2019 +0200 |
393 |
-+++ b/src/libs/vgeometry/vplacelabelitem.cpp Mon Dec 30 13:00:57 2019 +0200 |
394 |
-@@ -208,6 +208,22 @@ |
395 |
- return *this; |
396 |
- } |
397 |
- |
398 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
399 |
-+//--------------------------------------------------------------------------------------------------------------------- |
400 |
-+VPlaceLabelItem &VPlaceLabelItem::operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW |
401 |
-+{ |
402 |
-+ Swap(item); |
403 |
-+ return *this; |
404 |
-+} |
405 |
-+#endif |
406 |
-+ |
407 |
-+//--------------------------------------------------------------------------------------------------------------------- |
408 |
-+void VPlaceLabelItem::Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW |
409 |
-+{ |
410 |
-+ VPointF::Swap(item); |
411 |
-+ std::swap(d, item.d); |
412 |
-+} |
413 |
-+ |
414 |
- //--------------------------------------------------------------------------------------------------------------------- |
415 |
- PlaceLabelImg VPlaceLabelItem::LabelShape() const |
416 |
- { |
417 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vplacelabelitem.h |
418 |
---- a/src/libs/vgeometry/vplacelabelitem.h Sun Dec 29 14:37:46 2019 +0200 |
419 |
-+++ b/src/libs/vgeometry/vplacelabelitem.h Mon Dec 30 13:00:57 2019 +0200 |
420 |
-@@ -47,11 +47,10 @@ |
421 |
- |
422 |
- VPlaceLabelItem &operator=(const VPlaceLabelItem &item); |
423 |
- #ifdef Q_COMPILER_RVALUE_REFS |
424 |
-- VPlaceLabelItem &operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW { Swap(item); return *this; } |
425 |
-+ VPlaceLabelItem &operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW; |
426 |
- #endif |
427 |
- |
428 |
-- inline void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW |
429 |
-- { VPointF::Swap(item); std::swap(d, item.d); } |
430 |
-+ void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW; |
431 |
- |
432 |
- QString GetWidthFormula() const; |
433 |
- QString& GetWidthFormula(); |
434 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vpointf.cpp |
435 |
---- a/src/libs/vgeometry/vpointf.cpp Sun Dec 29 14:37:46 2019 +0200 |
436 |
-+++ b/src/libs/vgeometry/vpointf.cpp Mon Dec 30 13:00:57 2019 +0200 |
437 |
-@@ -101,6 +101,22 @@ |
438 |
- return *this; |
439 |
- } |
440 |
- |
441 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
442 |
-+//--------------------------------------------------------------------------------------------------------------------- |
443 |
-+VPointF &VPointF::operator=(VPointF &&point) Q_DECL_NOTHROW |
444 |
-+{ |
445 |
-+ Swap(point); |
446 |
-+ return *this; |
447 |
-+} |
448 |
-+#endif |
449 |
-+ |
450 |
-+//--------------------------------------------------------------------------------------------------------------------- |
451 |
-+void VPointF::Swap(VPointF &point) Q_DECL_NOTHROW |
452 |
-+{ |
453 |
-+ VGObject::Swap(point); |
454 |
-+ std::swap(d, point.d); |
455 |
-+} |
456 |
-+ |
457 |
- //--------------------------------------------------------------------------------------------------------------------- |
458 |
- VPointF::operator QPointF() const |
459 |
- { |
460 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vpointf.h |
461 |
---- a/src/libs/vgeometry/vpointf.h Sun Dec 29 14:37:46 2019 +0200 |
462 |
-+++ b/src/libs/vgeometry/vpointf.h Mon Dec 30 13:00:57 2019 +0200 |
463 |
-@@ -62,11 +62,10 @@ |
464 |
- |
465 |
- VPointF &operator=(const VPointF &point); |
466 |
- #ifdef Q_COMPILER_RVALUE_REFS |
467 |
-- VPointF &operator=(VPointF &&point) Q_DECL_NOTHROW { Swap(point); return *this; } |
468 |
-+ VPointF &operator=(VPointF &&point) Q_DECL_NOTHROW; |
469 |
- #endif |
470 |
- |
471 |
-- inline void Swap(VPointF &point) Q_DECL_NOTHROW |
472 |
-- { VGObject::Swap(point); std::swap(d, point.d); } |
473 |
-+ void Swap(VPointF &point) Q_DECL_NOTHROW; |
474 |
- |
475 |
- explicit operator QPointF() const; |
476 |
- VPointF Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const; |
477 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vspline.cpp |
478 |
---- a/src/libs/vgeometry/vspline.cpp Sun Dec 29 14:37:46 2019 +0200 |
479 |
-+++ b/src/libs/vgeometry/vspline.cpp Mon Dec 30 13:00:57 2019 +0200 |
480 |
-@@ -246,6 +246,22 @@ |
481 |
- return *this; |
482 |
- } |
483 |
- |
484 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
485 |
-+//--------------------------------------------------------------------------------------------------------------------- |
486 |
-+VSpline &VSpline::operator=(VSpline &&spline) Q_DECL_NOTHROW |
487 |
-+{ |
488 |
-+ Swap(spline); |
489 |
-+ return *this; |
490 |
-+} |
491 |
-+#endif |
492 |
-+ |
493 |
-+//--------------------------------------------------------------------------------------------------------------------- |
494 |
-+void VSpline::Swap(VSpline &spline) Q_DECL_NOTHROW |
495 |
-+{ |
496 |
-+ VAbstractCubicBezier::Swap(spline); |
497 |
-+ std::swap(d, spline.d); |
498 |
-+} |
499 |
-+ |
500 |
- //--------------------------------------------------------------------------------------------------------------------- |
501 |
- /** |
502 |
- * @brief GetP1 return first spline point. |
503 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vspline.h |
504 |
---- a/src/libs/vgeometry/vspline.h Sun Dec 29 14:37:46 2019 +0200 |
505 |
-+++ b/src/libs/vgeometry/vspline.h Mon Dec 30 13:00:57 2019 +0200 |
506 |
-@@ -67,11 +67,10 @@ |
507 |
- |
508 |
- VSpline &operator=(const VSpline &spline); |
509 |
- #ifdef Q_COMPILER_RVALUE_REFS |
510 |
-- VSpline &operator=(VSpline &&spline) Q_DECL_NOTHROW { Swap(spline); return *this; } |
511 |
-+ VSpline &operator=(VSpline &&spline) Q_DECL_NOTHROW; |
512 |
- #endif |
513 |
- |
514 |
-- inline void Swap(VSpline &spline) Q_DECL_NOTHROW |
515 |
-- { VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); } |
516 |
-+ void Swap(VSpline &spline) Q_DECL_NOTHROW; |
517 |
- |
518 |
- virtual VPointF GetP1 () const override; |
519 |
- void SetP1 (const VPointF &p); |
520 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepath.cpp |
521 |
---- a/src/libs/vgeometry/vsplinepath.cpp Sun Dec 29 14:37:46 2019 +0200 |
522 |
-+++ b/src/libs/vgeometry/vsplinepath.cpp Mon Dec 30 13:00:57 2019 +0200 |
523 |
-@@ -301,6 +301,22 @@ |
524 |
- return *this; |
525 |
- } |
526 |
- |
527 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
528 |
-+//--------------------------------------------------------------------------------------------------------------------- |
529 |
-+VSplinePath &VSplinePath::operator=(VSplinePath &&path) Q_DECL_NOTHROW |
530 |
-+{ |
531 |
-+ Swap(path); |
532 |
-+ return *this; |
533 |
-+} |
534 |
-+#endif |
535 |
-+ |
536 |
-+//--------------------------------------------------------------------------------------------------------------------- |
537 |
-+void VSplinePath::Swap(VSplinePath &path) Q_DECL_NOTHROW |
538 |
-+{ |
539 |
-+ VAbstractCubicBezierPath::Swap(path); |
540 |
-+ std::swap(d, path.d); |
541 |
-+} |
542 |
-+ |
543 |
- //--------------------------------------------------------------------------------------------------------------------- |
544 |
- /** |
545 |
- * @brief operator [] return spline point by index. |
546 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepath.h |
547 |
---- a/src/libs/vgeometry/vsplinepath.h Sun Dec 29 14:37:46 2019 +0200 |
548 |
-+++ b/src/libs/vgeometry/vsplinepath.h Mon Dec 30 13:00:57 2019 +0200 |
549 |
-@@ -67,11 +67,10 @@ |
550 |
- VSplinePoint &operator[](int indx); |
551 |
- VSplinePath &operator=(const VSplinePath &path); |
552 |
- #ifdef Q_COMPILER_RVALUE_REFS |
553 |
-- VSplinePath &operator=(VSplinePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } |
554 |
-+ VSplinePath &operator=(VSplinePath &&path) Q_DECL_NOTHROW; |
555 |
- #endif |
556 |
- |
557 |
-- inline void Swap(VSplinePath &path) Q_DECL_NOTHROW |
558 |
-- { VAbstractCubicBezierPath::Swap(path); std::swap(d, path.d); } |
559 |
-+ void Swap(VSplinePath &path) Q_DECL_NOTHROW; |
560 |
- |
561 |
- void append(const VSplinePoint &point); |
562 |
- |
563 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepoint.cpp |
564 |
---- a/src/libs/vgeometry/vsplinepoint.cpp Sun Dec 29 14:37:46 2019 +0200 |
565 |
-+++ b/src/libs/vgeometry/vsplinepoint.cpp Mon Dec 30 13:00:57 2019 +0200 |
566 |
-@@ -74,6 +74,20 @@ |
567 |
- return *this; |
568 |
- } |
569 |
- |
570 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
571 |
-+//--------------------------------------------------------------------------------------------------------------------- |
572 |
-+VFSplinePoint &VFSplinePoint::operator=(VFSplinePoint &&point) Q_DECL_NOTHROW |
573 |
-+{ |
574 |
-+ Swap(point); |
575 |
-+ return *this; |
576 |
-+} |
577 |
-+#endif |
578 |
-+ |
579 |
-+void VFSplinePoint::Swap(VFSplinePoint &point) Q_DECL_NOTHROW |
580 |
-+{ |
581 |
-+ std::swap(d, point.d); |
582 |
-+} |
583 |
-+ |
584 |
- //--------------------------------------------------------------------------------------------------------------------- |
585 |
- VFSplinePoint::~VFSplinePoint() |
586 |
- {} |
587 |
-@@ -219,6 +233,21 @@ |
588 |
- return *this; |
589 |
- } |
590 |
- |
591 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
592 |
-+//--------------------------------------------------------------------------------------------------------------------- |
593 |
-+VSplinePoint &VSplinePoint::operator=(VSplinePoint &&point) Q_DECL_NOTHROW |
594 |
-+{ |
595 |
-+ Swap(point); |
596 |
-+ return *this; |
597 |
-+} |
598 |
-+#endif |
599 |
-+ |
600 |
-+//--------------------------------------------------------------------------------------------------------------------- |
601 |
-+void VSplinePoint::Swap(VSplinePoint &point) Q_DECL_NOTHROW |
602 |
-+{ |
603 |
-+ std::swap(d, point.d); |
604 |
-+} |
605 |
-+ |
606 |
- //--------------------------------------------------------------------------------------------------------------------- |
607 |
- VSplinePoint::~VSplinePoint() |
608 |
- { |
609 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vgeometry/vsplinepoint.h |
610 |
---- a/src/libs/vgeometry/vsplinepoint.h Sun Dec 29 14:37:46 2019 +0200 |
611 |
-+++ b/src/libs/vgeometry/vsplinepoint.h Mon Dec 30 13:00:57 2019 +0200 |
612 |
-@@ -53,11 +53,10 @@ |
613 |
- |
614 |
- VFSplinePoint &operator=(const VFSplinePoint &point); |
615 |
- #ifdef Q_COMPILER_RVALUE_REFS |
616 |
-- VFSplinePoint &operator=(VFSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; } |
617 |
-+ VFSplinePoint &operator=(VFSplinePoint &&point) Q_DECL_NOTHROW; |
618 |
- #endif |
619 |
- |
620 |
-- inline void Swap(VFSplinePoint &point) Q_DECL_NOTHROW |
621 |
-- { std::swap(d, point.d); } |
622 |
-+ void Swap(VFSplinePoint &point) Q_DECL_NOTHROW; |
623 |
- |
624 |
- VPointF P() const; |
625 |
- void SetP(const VPointF &value); |
626 |
-@@ -93,11 +92,10 @@ |
627 |
- |
628 |
- VSplinePoint &operator=(const VSplinePoint &point); |
629 |
- #ifdef Q_COMPILER_RVALUE_REFS |
630 |
-- VSplinePoint &operator=(VSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; } |
631 |
-+ VSplinePoint &operator=(VSplinePoint &&point) Q_DECL_NOTHROW; |
632 |
- #endif |
633 |
- |
634 |
-- inline void Swap(VSplinePoint &point) Q_DECL_NOTHROW |
635 |
-- { std::swap(d, point.d); } |
636 |
-+ void Swap(VSplinePoint &point) Q_DECL_NOTHROW; |
637 |
- |
638 |
- VPointF P() const; |
639 |
- void SetP(const VPointF &value); |
640 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vabstractpiece.cpp |
641 |
---- a/src/libs/vlayout/vabstractpiece.cpp Sun Dec 29 14:37:46 2019 +0200 |
642 |
-+++ b/src/libs/vlayout/vabstractpiece.cpp Mon Dec 30 13:00:57 2019 +0200 |
643 |
-@@ -778,6 +778,21 @@ |
644 |
- return *this; |
645 |
- } |
646 |
- |
647 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
648 |
-+//--------------------------------------------------------------------------------------------------------------------- |
649 |
-+VAbstractPiece &VAbstractPiece::operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW |
650 |
-+{ |
651 |
-+ Swap(piece); |
652 |
-+ return *this; |
653 |
-+} |
654 |
-+#endif |
655 |
-+ |
656 |
-+//--------------------------------------------------------------------------------------------------------------------- |
657 |
-+void VAbstractPiece::Swap(VAbstractPiece &piece) Q_DECL_NOTHROW |
658 |
-+{ |
659 |
-+ std::swap(d, piece.d); |
660 |
-+} |
661 |
-+ |
662 |
- //--------------------------------------------------------------------------------------------------------------------- |
663 |
- VAbstractPiece::~VAbstractPiece() |
664 |
- {} |
665 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vabstractpiece.h |
666 |
---- a/src/libs/vlayout/vabstractpiece.h Sun Dec 29 14:37:46 2019 +0200 |
667 |
-+++ b/src/libs/vlayout/vabstractpiece.h Mon Dec 30 13:00:57 2019 +0200 |
668 |
-@@ -154,11 +154,10 @@ |
669 |
- |
670 |
- VAbstractPiece &operator=(const VAbstractPiece &piece); |
671 |
- #ifdef Q_COMPILER_RVALUE_REFS |
672 |
-- VAbstractPiece &operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; } |
673 |
-+ VAbstractPiece &operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW; |
674 |
- #endif |
675 |
- |
676 |
-- inline void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW |
677 |
-- { std::swap(d, piece.d); } |
678 |
-+ void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW; |
679 |
- |
680 |
- QString GetName() const; |
681 |
- void SetName(const QString &value); |
682 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vcontour.cpp |
683 |
---- a/src/libs/vlayout/vcontour.cpp Sun Dec 29 14:37:46 2019 +0200 |
684 |
-+++ b/src/libs/vlayout/vcontour.cpp Mon Dec 30 13:00:57 2019 +0200 |
685 |
-@@ -66,6 +66,21 @@ |
686 |
- return *this; |
687 |
- } |
688 |
- |
689 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
690 |
-+//--------------------------------------------------------------------------------------------------------------------- |
691 |
-+VContour &VContour::operator=(VContour &&contour) Q_DECL_NOTHROW |
692 |
-+{ |
693 |
-+ Swap(contour); |
694 |
-+ return *this; |
695 |
-+} |
696 |
-+#endif |
697 |
-+ |
698 |
-+//--------------------------------------------------------------------------------------------------------------------- |
699 |
-+void VContour::Swap(VContour &contour) Q_DECL_NOTHROW |
700 |
-+{ |
701 |
-+ std::swap(d, contour.d); |
702 |
-+} |
703 |
-+ |
704 |
- //--------------------------------------------------------------------------------------------------------------------- |
705 |
- VContour::~VContour() |
706 |
- {} |
707 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vcontour.h |
708 |
---- a/src/libs/vlayout/vcontour.h Sun Dec 29 14:37:46 2019 +0200 |
709 |
-+++ b/src/libs/vlayout/vcontour.h Mon Dec 30 13:00:57 2019 +0200 |
710 |
-@@ -55,11 +55,10 @@ |
711 |
- |
712 |
- VContour &operator=(const VContour &contour); |
713 |
- #ifdef Q_COMPILER_RVALUE_REFS |
714 |
-- VContour &operator=(VContour &&contour) Q_DECL_NOTHROW { Swap(contour); return *this; } |
715 |
-+ VContour &operator=(VContour &&contour) Q_DECL_NOTHROW; |
716 |
- #endif |
717 |
- |
718 |
-- inline void Swap(VContour &contour) Q_DECL_NOTHROW |
719 |
-- { std::swap(d, contour.d); } |
720 |
-+ void Swap(VContour &contour) Q_DECL_NOTHROW; |
721 |
- |
722 |
- void SetContour(const QVector<QPointF> &contour); |
723 |
- QVector<QPointF> GetContour() const; |
724 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpaper.cpp |
725 |
---- a/src/libs/vlayout/vlayoutpaper.cpp Sun Dec 29 14:37:46 2019 +0200 |
726 |
-+++ b/src/libs/vlayout/vlayoutpaper.cpp Mon Dec 30 13:00:57 2019 +0200 |
727 |
-@@ -75,6 +75,21 @@ |
728 |
- return *this; |
729 |
- } |
730 |
- |
731 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
732 |
-+//--------------------------------------------------------------------------------------------------------------------- |
733 |
-+VLayoutPaper &VLayoutPaper::operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW |
734 |
-+{ |
735 |
-+ Swap(paper); |
736 |
-+ return *this; |
737 |
-+} |
738 |
-+#endif |
739 |
-+ |
740 |
-+//--------------------------------------------------------------------------------------------------------------------- |
741 |
-+void VLayoutPaper::Swap(VLayoutPaper &paper) Q_DECL_NOTHROW |
742 |
-+{ |
743 |
-+ std::swap(d, paper.d); |
744 |
-+} |
745 |
-+ |
746 |
- //--------------------------------------------------------------------------------------------------------------------- |
747 |
- VLayoutPaper::~VLayoutPaper() |
748 |
- {} |
749 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpaper.h |
750 |
---- a/src/libs/vlayout/vlayoutpaper.h Sun Dec 29 14:37:46 2019 +0200 |
751 |
-+++ b/src/libs/vlayout/vlayoutpaper.h Mon Dec 30 13:00:57 2019 +0200 |
752 |
-@@ -57,11 +57,10 @@ |
753 |
- |
754 |
- VLayoutPaper &operator=(const VLayoutPaper &paper); |
755 |
- #ifdef Q_COMPILER_RVALUE_REFS |
756 |
-- VLayoutPaper &operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW { Swap(paper); return *this; } |
757 |
-+ VLayoutPaper &operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW; |
758 |
- #endif |
759 |
- |
760 |
-- inline void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW |
761 |
-- { std::swap(d, paper.d); } |
762 |
-+ void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW; |
763 |
- |
764 |
- int GetHeight() const; |
765 |
- void SetHeight(int height); |
766 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiece.cpp |
767 |
---- a/src/libs/vlayout/vlayoutpiece.cpp Sun Dec 29 14:37:46 2019 +0200 |
768 |
-+++ b/src/libs/vlayout/vlayoutpiece.cpp Mon Dec 30 13:00:57 2019 +0200 |
769 |
-@@ -388,6 +388,22 @@ |
770 |
- return *this; |
771 |
- } |
772 |
- |
773 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
774 |
-+//--------------------------------------------------------------------------------------------------------------------- |
775 |
-+VLayoutPiece &VLayoutPiece::operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW |
776 |
-+{ |
777 |
-+ Swap(detail); |
778 |
-+ return *this; |
779 |
-+} |
780 |
-+#endif |
781 |
-+ |
782 |
-+//--------------------------------------------------------------------------------------------------------------------- |
783 |
-+void VLayoutPiece::Swap(VLayoutPiece &detail) Q_DECL_NOTHROW |
784 |
-+{ |
785 |
-+ VAbstractPiece::Swap(detail); |
786 |
-+ std::swap(d, detail.d); |
787 |
-+} |
788 |
-+ |
789 |
- //--------------------------------------------------------------------------------------------------------------------- |
790 |
- VLayoutPiece::~VLayoutPiece() |
791 |
- {} |
792 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiece.h |
793 |
---- a/src/libs/vlayout/vlayoutpiece.h Sun Dec 29 14:37:46 2019 +0200 |
794 |
-+++ b/src/libs/vlayout/vlayoutpiece.h Mon Dec 30 13:00:57 2019 +0200 |
795 |
-@@ -65,11 +65,10 @@ |
796 |
- |
797 |
- VLayoutPiece &operator=(const VLayoutPiece &detail); |
798 |
- #ifdef Q_COMPILER_RVALUE_REFS |
799 |
-- VLayoutPiece &operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW { Swap(detail); return *this; } |
800 |
-+ VLayoutPiece &operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW; |
801 |
- #endif |
802 |
- |
803 |
-- inline void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW |
804 |
-- { VAbstractPiece::Swap(detail); std::swap(d, detail.d); } |
805 |
-+ void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW; |
806 |
- |
807 |
- static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern); |
808 |
- |
809 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiecepath.cpp |
810 |
---- a/src/libs/vlayout/vlayoutpiecepath.cpp Sun Dec 29 14:37:46 2019 +0200 |
811 |
-+++ b/src/libs/vlayout/vlayoutpiecepath.cpp Mon Dec 30 13:00:57 2019 +0200 |
812 |
-@@ -61,6 +61,21 @@ |
813 |
- return *this; |
814 |
- } |
815 |
- |
816 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
817 |
-+//--------------------------------------------------------------------------------------------------------------------- |
818 |
-+VLayoutPiecePath &VLayoutPiecePath::operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW |
819 |
-+{ |
820 |
-+ Swap(path); |
821 |
-+ return *this; |
822 |
-+} |
823 |
-+#endif |
824 |
-+ |
825 |
-+//--------------------------------------------------------------------------------------------------------------------- |
826 |
-+void VLayoutPiecePath::Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW |
827 |
-+{ |
828 |
-+ std::swap(d, path.d); |
829 |
-+} |
830 |
-+ |
831 |
- //--------------------------------------------------------------------------------------------------------------------- |
832 |
- VLayoutPiecePath::~VLayoutPiecePath() |
833 |
- { |
834 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vlayout/vlayoutpiecepath.h |
835 |
---- a/src/libs/vlayout/vlayoutpiecepath.h Sun Dec 29 14:37:46 2019 +0200 |
836 |
-+++ b/src/libs/vlayout/vlayoutpiecepath.h Mon Dec 30 13:00:57 2019 +0200 |
837 |
-@@ -46,11 +46,10 @@ |
838 |
- |
839 |
- VLayoutPiecePath &operator=(const VLayoutPiecePath &path); |
840 |
- #ifdef Q_COMPILER_RVALUE_REFS |
841 |
-- VLayoutPiecePath &operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } |
842 |
-+ VLayoutPiecePath &operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW; |
843 |
- #endif |
844 |
- |
845 |
-- inline void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW |
846 |
-- { std::swap(d, path.d); } |
847 |
-+ void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW; |
848 |
- |
849 |
- QPainterPath GetPainterPath() const; |
850 |
- |
851 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp |
852 |
---- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp Sun Dec 29 14:37:46 2019 +0200 |
853 |
-+++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.cpp Mon Dec 30 13:00:57 2019 +0200 |
854 |
-@@ -50,6 +50,21 @@ |
855 |
- return *this; |
856 |
- } |
857 |
- |
858 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
859 |
-+//--------------------------------------------------------------------------------------------------------------------- |
860 |
-+VAbstractFloatItemData &VAbstractFloatItemData::operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW |
861 |
-+{ |
862 |
-+ Swap(data); |
863 |
-+ return *this; |
864 |
-+} |
865 |
-+#endif |
866 |
-+ |
867 |
-+//--------------------------------------------------------------------------------------------------------------------- |
868 |
-+void VAbstractFloatItemData::Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW |
869 |
-+{ |
870 |
-+ std::swap(d, data.d); |
871 |
-+} |
872 |
-+ |
873 |
- //--------------------------------------------------------------------------------------------------------------------- |
874 |
- VAbstractFloatItemData::~VAbstractFloatItemData() |
875 |
- {} |
876 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h |
877 |
---- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h Sun Dec 29 14:37:46 2019 +0200 |
878 |
-+++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h Mon Dec 30 13:00:57 2019 +0200 |
879 |
-@@ -44,11 +44,10 @@ |
880 |
- |
881 |
- VAbstractFloatItemData &operator=(const VAbstractFloatItemData &data); |
882 |
- #ifdef Q_COMPILER_RVALUE_REFS |
883 |
-- VAbstractFloatItemData &operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } |
884 |
-+ VAbstractFloatItemData &operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW; |
885 |
- #endif |
886 |
- |
887 |
-- inline void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW |
888 |
-- { std::swap(d, data.d); } |
889 |
-+ void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW; |
890 |
- |
891 |
- // methods, which set and return values of different parameters |
892 |
- QPointF GetPos() const; |
893 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp |
894 |
---- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp Sun Dec 29 14:37:46 2019 +0200 |
895 |
-+++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.cpp Mon Dec 30 13:00:57 2019 +0200 |
896 |
-@@ -55,6 +55,22 @@ |
897 |
- return *this; |
898 |
- } |
899 |
- |
900 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
901 |
-+//--------------------------------------------------------------------------------------------------------------------- |
902 |
-+VGrainlineData &VGrainlineData::operator=(VGrainlineData &&data) Q_DECL_NOTHROW |
903 |
-+{ |
904 |
-+ Swap(data); |
905 |
-+ return *this; |
906 |
-+} |
907 |
-+#endif |
908 |
-+ |
909 |
-+//--------------------------------------------------------------------------------------------------------------------- |
910 |
-+void VGrainlineData::Swap(VGrainlineData &data) Q_DECL_NOTHROW |
911 |
-+{ |
912 |
-+ VAbstractFloatItemData::Swap(data); |
913 |
-+ std::swap(d, data.d); |
914 |
-+} |
915 |
-+ |
916 |
- //--------------------------------------------------------------------------------------------------------------------- |
917 |
- VGrainlineData::~VGrainlineData() |
918 |
- {} |
919 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vgrainlinedata.h |
920 |
---- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h Sun Dec 29 14:37:46 2019 +0200 |
921 |
-+++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h Mon Dec 30 13:00:57 2019 +0200 |
922 |
-@@ -51,11 +51,10 @@ |
923 |
- |
924 |
- VGrainlineData &operator=(const VGrainlineData &data); |
925 |
- #ifdef Q_COMPILER_RVALUE_REFS |
926 |
-- VGrainlineData &operator=(VGrainlineData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } |
927 |
-+ VGrainlineData &operator=(VGrainlineData &&data) Q_DECL_NOTHROW; |
928 |
- #endif |
929 |
- |
930 |
-- inline void Swap(VGrainlineData &data) Q_DECL_NOTHROW |
931 |
-- { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); } |
932 |
-+ void Swap(VGrainlineData &data) Q_DECL_NOTHROW; |
933 |
- |
934 |
- // methods, which set and return values of different parameters |
935 |
- QString GetLength() const; |
936 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp |
937 |
---- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp Sun Dec 29 14:37:46 2019 +0200 |
938 |
-+++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.cpp Mon Dec 30 13:00:57 2019 +0200 |
939 |
-@@ -54,6 +54,22 @@ |
940 |
- return *this; |
941 |
- } |
942 |
- |
943 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
944 |
-+//--------------------------------------------------------------------------------------------------------------------- |
945 |
-+VPatternLabelData &VPatternLabelData::operator=(VPatternLabelData &&data) Q_DECL_NOTHROW |
946 |
-+{ |
947 |
-+ Swap(data); |
948 |
-+ return *this; |
949 |
-+} |
950 |
-+#endif |
951 |
-+ |
952 |
-+//--------------------------------------------------------------------------------------------------------------------- |
953 |
-+void VPatternLabelData::Swap(VPatternLabelData &data) Q_DECL_NOTHROW |
954 |
-+{ |
955 |
-+ VAbstractFloatItemData::Swap(data); |
956 |
-+ std::swap(d, data.d); |
957 |
-+} |
958 |
-+ |
959 |
- //--------------------------------------------------------------------------------------------------------------------- |
960 |
- VPatternLabelData::~VPatternLabelData() |
961 |
- {} |
962 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpatternlabeldata.h |
963 |
---- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h Sun Dec 29 14:37:46 2019 +0200 |
964 |
-+++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h Mon Dec 30 13:00:57 2019 +0200 |
965 |
-@@ -48,11 +48,10 @@ |
966 |
- |
967 |
- VPatternLabelData &operator=(const VPatternLabelData &data); |
968 |
- #ifdef Q_COMPILER_RVALUE_REFS |
969 |
-- VPatternLabelData &operator=(VPatternLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } |
970 |
-+ VPatternLabelData &operator=(VPatternLabelData &&data) Q_DECL_NOTHROW; |
971 |
- #endif |
972 |
- |
973 |
-- inline void Swap(VPatternLabelData &data) Q_DECL_NOTHROW |
974 |
-- { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); } |
975 |
-+ void Swap(VPatternLabelData &data) Q_DECL_NOTHROW; |
976 |
- |
977 |
- // methods, which set up label parameters |
978 |
- QString GetLabelWidth() const; |
979 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp |
980 |
---- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp Sun Dec 29 14:37:46 2019 +0200 |
981 |
-+++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp Mon Dec 30 13:00:57 2019 +0200 |
982 |
-@@ -55,6 +55,22 @@ |
983 |
- return *this; |
984 |
- } |
985 |
- |
986 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
987 |
-+//--------------------------------------------------------------------------------------------------------------------- |
988 |
-+VPieceLabelData &VPieceLabelData::operator=(VPieceLabelData &&data) Q_DECL_NOTHROW |
989 |
-+{ |
990 |
-+ Swap(data); |
991 |
-+ return *this; |
992 |
-+} |
993 |
-+#endif |
994 |
-+ |
995 |
-+//--------------------------------------------------------------------------------------------------------------------- |
996 |
-+void VPieceLabelData::Swap(VPieceLabelData &data) Q_DECL_NOTHROW |
997 |
-+{ |
998 |
-+ VPatternLabelData::Swap(data); |
999 |
-+ std::swap(d, data.d); |
1000 |
-+} |
1001 |
-+ |
1002 |
- //--------------------------------------------------------------------------------------------------------------------- |
1003 |
- VPieceLabelData::~VPieceLabelData() |
1004 |
- {} |
1005 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/floatItemData/vpiecelabeldata.h |
1006 |
---- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h Sun Dec 29 14:37:46 2019 +0200 |
1007 |
-+++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h Mon Dec 30 13:00:57 2019 +0200 |
1008 |
-@@ -51,11 +51,10 @@ |
1009 |
- |
1010 |
- VPieceLabelData &operator=(const VPieceLabelData &data); |
1011 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1012 |
-- VPieceLabelData &operator=(VPieceLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } |
1013 |
-+ VPieceLabelData &operator=(VPieceLabelData &&data) Q_DECL_NOTHROW; |
1014 |
- #endif |
1015 |
- |
1016 |
-- inline void Swap(VPieceLabelData &data) Q_DECL_NOTHROW |
1017 |
-- { VPatternLabelData::Swap(data); std::swap(d, data.d); } |
1018 |
-+ void Swap(VPieceLabelData &data) Q_DECL_NOTHROW; |
1019 |
- |
1020 |
- void Clear(); |
1021 |
- |
1022 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vcurvevariable.cpp |
1023 |
---- a/src/libs/vpatterndb/variables/vcurvevariable.cpp Sun Dec 29 14:37:46 2019 +0200 |
1024 |
-+++ b/src/libs/vpatterndb/variables/vcurvevariable.cpp Mon Dec 30 13:00:57 2019 +0200 |
1025 |
-@@ -64,6 +64,22 @@ |
1026 |
- return *this; |
1027 |
- } |
1028 |
- |
1029 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1030 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1031 |
-+VCurveVariable &VCurveVariable::operator=(VCurveVariable &&var) Q_DECL_NOTHROW |
1032 |
-+{ |
1033 |
-+ Swap(var); |
1034 |
-+ return *this; |
1035 |
-+} |
1036 |
-+#endif |
1037 |
-+ |
1038 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1039 |
-+void VCurveVariable::Swap(VCurveVariable &var) Q_DECL_NOTHROW |
1040 |
-+{ |
1041 |
-+ VInternalVariable::Swap(var); |
1042 |
-+ std::swap(d, var.d); |
1043 |
-+} |
1044 |
-+ |
1045 |
- //--------------------------------------------------------------------------------------------------------------------- |
1046 |
- VCurveVariable::~VCurveVariable() |
1047 |
- {} |
1048 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vcurvevariable.h |
1049 |
---- a/src/libs/vpatterndb/variables/vcurvevariable.h Sun Dec 29 14:37:46 2019 +0200 |
1050 |
-+++ b/src/libs/vpatterndb/variables/vcurvevariable.h Mon Dec 30 13:00:57 2019 +0200 |
1051 |
-@@ -49,11 +49,10 @@ |
1052 |
- |
1053 |
- VCurveVariable &operator=(const VCurveVariable &var); |
1054 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1055 |
-- VCurveVariable &operator=(VCurveVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } |
1056 |
-+ VCurveVariable &operator=(VCurveVariable &&var) Q_DECL_NOTHROW; |
1057 |
- #endif |
1058 |
- |
1059 |
-- inline void Swap(VCurveVariable &var) Q_DECL_NOTHROW |
1060 |
-- { VInternalVariable::Swap(var); std::swap(d, var.d); } |
1061 |
-+ void Swap(VCurveVariable &var) Q_DECL_NOTHROW; |
1062 |
- |
1063 |
- virtual bool Filter(quint32 id) override; |
1064 |
- |
1065 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vincrement.cpp |
1066 |
---- a/src/libs/vpatterndb/variables/vincrement.cpp Sun Dec 29 14:37:46 2019 +0200 |
1067 |
-+++ b/src/libs/vpatterndb/variables/vincrement.cpp Mon Dec 30 13:00:57 2019 +0200 |
1068 |
-@@ -74,6 +74,22 @@ |
1069 |
- return *this; |
1070 |
- } |
1071 |
- |
1072 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1073 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1074 |
-+VIncrement &VIncrement::operator=(VIncrement &&incr) Q_DECL_NOTHROW |
1075 |
-+{ |
1076 |
-+ Swap(incr); |
1077 |
-+ return *this; |
1078 |
-+} |
1079 |
-+#endif |
1080 |
-+ |
1081 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1082 |
-+void VIncrement::Swap(VIncrement &incr) Q_DECL_NOTHROW |
1083 |
-+{ |
1084 |
-+ VVariable::Swap(incr); |
1085 |
-+ std::swap(d, incr.d); |
1086 |
-+} |
1087 |
-+ |
1088 |
- //--------------------------------------------------------------------------------------------------------------------- |
1089 |
- VIncrement::~VIncrement() |
1090 |
- {} |
1091 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vincrement.h |
1092 |
---- a/src/libs/vpatterndb/variables/vincrement.h Sun Dec 29 14:37:46 2019 +0200 |
1093 |
-+++ b/src/libs/vpatterndb/variables/vincrement.h Mon Dec 30 13:00:57 2019 +0200 |
1094 |
-@@ -55,11 +55,10 @@ |
1095 |
- |
1096 |
- VIncrement &operator=(const VIncrement &incr); |
1097 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1098 |
-- VIncrement &operator=(VIncrement &&incr) Q_DECL_NOTHROW { Swap(incr); return *this; } |
1099 |
-+ VIncrement &operator=(VIncrement &&incr) Q_DECL_NOTHROW; |
1100 |
- #endif |
1101 |
- |
1102 |
-- inline void Swap(VIncrement &incr) Q_DECL_NOTHROW |
1103 |
-- { VVariable::Swap(incr); std::swap(d, incr.d); } |
1104 |
-+ void Swap(VIncrement &incr) Q_DECL_NOTHROW; |
1105 |
- |
1106 |
- quint32 getIndex() const; |
1107 |
- QString GetFormula() const; |
1108 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vinternalvariable.cpp |
1109 |
---- a/src/libs/vpatterndb/variables/vinternalvariable.cpp Sun Dec 29 14:37:46 2019 +0200 |
1110 |
-+++ b/src/libs/vpatterndb/variables/vinternalvariable.cpp Mon Dec 30 13:00:57 2019 +0200 |
1111 |
-@@ -50,6 +50,21 @@ |
1112 |
- return *this; |
1113 |
- } |
1114 |
- |
1115 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1116 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1117 |
-+VInternalVariable &VInternalVariable::operator=(VInternalVariable &&var) Q_DECL_NOTHROW |
1118 |
-+{ |
1119 |
-+ Swap(var); |
1120 |
-+ return *this; |
1121 |
-+} |
1122 |
-+#endif |
1123 |
-+ |
1124 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1125 |
-+void VInternalVariable::Swap(VInternalVariable &var) Q_DECL_NOTHROW |
1126 |
-+{ |
1127 |
-+ std::swap(d, var.d); |
1128 |
-+} |
1129 |
-+ |
1130 |
- //--------------------------------------------------------------------------------------------------------------------- |
1131 |
- VInternalVariable::~VInternalVariable() |
1132 |
- {} |
1133 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vinternalvariable.h |
1134 |
---- a/src/libs/vpatterndb/variables/vinternalvariable.h Sun Dec 29 14:37:46 2019 +0200 |
1135 |
-+++ b/src/libs/vpatterndb/variables/vinternalvariable.h Mon Dec 30 13:00:57 2019 +0200 |
1136 |
-@@ -48,11 +48,10 @@ |
1137 |
- |
1138 |
- VInternalVariable &operator=(const VInternalVariable &var); |
1139 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1140 |
-- VInternalVariable &operator=(VInternalVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } |
1141 |
-+ VInternalVariable &operator=(VInternalVariable &&var) Q_DECL_NOTHROW; |
1142 |
- #endif |
1143 |
- |
1144 |
-- inline void Swap(VInternalVariable &var) Q_DECL_NOTHROW |
1145 |
-- { std::swap(d, var.d); } |
1146 |
-+ void Swap(VInternalVariable &var) Q_DECL_NOTHROW; |
1147 |
- |
1148 |
- virtual qreal GetValue() const; |
1149 |
- virtual qreal* GetValue(); |
1150 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlineangle.cpp |
1151 |
---- a/src/libs/vpatterndb/variables/vlineangle.cpp Sun Dec 29 14:37:46 2019 +0200 |
1152 |
-+++ b/src/libs/vpatterndb/variables/vlineangle.cpp Mon Dec 30 13:00:57 2019 +0200 |
1153 |
-@@ -77,6 +77,22 @@ |
1154 |
- return *this; |
1155 |
- } |
1156 |
- |
1157 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1158 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1159 |
-+VLineAngle &VLineAngle::operator=(VLineAngle &&var) Q_DECL_NOTHROW |
1160 |
-+{ |
1161 |
-+ Swap(var); |
1162 |
-+ return *this; |
1163 |
-+} |
1164 |
-+#endif |
1165 |
-+ |
1166 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1167 |
-+void VLineAngle::Swap(VLineAngle &var) Q_DECL_NOTHROW |
1168 |
-+{ |
1169 |
-+ VInternalVariable::Swap(var); |
1170 |
-+ std::swap(d, var.d); |
1171 |
-+} |
1172 |
-+ |
1173 |
- //--------------------------------------------------------------------------------------------------------------------- |
1174 |
- VLineAngle::~VLineAngle() |
1175 |
- {} |
1176 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlineangle.h |
1177 |
---- a/src/libs/vpatterndb/variables/vlineangle.h Sun Dec 29 14:37:46 2019 +0200 |
1178 |
-+++ b/src/libs/vpatterndb/variables/vlineangle.h Mon Dec 30 13:00:57 2019 +0200 |
1179 |
-@@ -50,11 +50,10 @@ |
1180 |
- |
1181 |
- VLineAngle &operator=(const VLineAngle &var); |
1182 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1183 |
-- VLineAngle &operator=(VLineAngle &&var) Q_DECL_NOTHROW { Swap(var); return *this; } |
1184 |
-+ VLineAngle &operator=(VLineAngle &&var) Q_DECL_NOTHROW; |
1185 |
- #endif |
1186 |
- |
1187 |
-- inline void Swap(VLineAngle &var) Q_DECL_NOTHROW |
1188 |
-- { VInternalVariable::Swap(var); std::swap(d, var.d); } |
1189 |
-+ void Swap(VLineAngle &var) Q_DECL_NOTHROW; |
1190 |
- |
1191 |
- virtual bool Filter(quint32 id) override; |
1192 |
- void SetValue(const VPointF *p1, const VPointF *p2); |
1193 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlinelength.cpp |
1194 |
---- a/src/libs/vpatterndb/variables/vlinelength.cpp Sun Dec 29 14:37:46 2019 +0200 |
1195 |
-+++ b/src/libs/vpatterndb/variables/vlinelength.cpp Mon Dec 30 13:00:57 2019 +0200 |
1196 |
-@@ -75,6 +75,22 @@ |
1197 |
- return *this; |
1198 |
- } |
1199 |
- |
1200 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1201 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1202 |
-+VLengthLine &VLengthLine::operator=(VLengthLine &&var) Q_DECL_NOTHROW |
1203 |
-+{ |
1204 |
-+ Swap(var); |
1205 |
-+ return *this; |
1206 |
-+} |
1207 |
-+#endif |
1208 |
-+ |
1209 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1210 |
-+void VLengthLine::Swap(VLengthLine &var) Q_DECL_NOTHROW |
1211 |
-+{ |
1212 |
-+ VInternalVariable::Swap(var); |
1213 |
-+ std::swap(d, var.d); |
1214 |
-+} |
1215 |
-+ |
1216 |
- //--------------------------------------------------------------------------------------------------------------------- |
1217 |
- VLengthLine::~VLengthLine() |
1218 |
- {} |
1219 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vlinelength.h |
1220 |
---- a/src/libs/vpatterndb/variables/vlinelength.h Sun Dec 29 14:37:46 2019 +0200 |
1221 |
-+++ b/src/libs/vpatterndb/variables/vlinelength.h Mon Dec 30 13:00:57 2019 +0200 |
1222 |
-@@ -52,11 +52,10 @@ |
1223 |
- |
1224 |
- VLengthLine &operator=(const VLengthLine &var); |
1225 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1226 |
-- VLengthLine &operator=(VLengthLine &&var) Q_DECL_NOTHROW { Swap(var); return *this; } |
1227 |
-+ VLengthLine &operator=(VLengthLine &&var) Q_DECL_NOTHROW; |
1228 |
- #endif |
1229 |
- |
1230 |
-- inline void Swap(VLengthLine &var) Q_DECL_NOTHROW |
1231 |
-- { VInternalVariable::Swap(var); std::swap(d, var.d); } |
1232 |
-+ void Swap(VLengthLine &var) Q_DECL_NOTHROW; |
1233 |
- |
1234 |
- virtual bool Filter(quint32 id) override; |
1235 |
- void SetValue(const VPointF *p1, const VPointF *p2); |
1236 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vmeasurement.cpp |
1237 |
---- a/src/libs/vpatterndb/variables/vmeasurement.cpp Sun Dec 29 14:37:46 2019 +0200 |
1238 |
-+++ b/src/libs/vpatterndb/variables/vmeasurement.cpp Mon Dec 30 13:00:57 2019 +0200 |
1239 |
-@@ -92,6 +92,22 @@ |
1240 |
- return *this; |
1241 |
- } |
1242 |
- |
1243 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1244 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1245 |
-+VMeasurement &VMeasurement::operator=(VMeasurement &&m) Q_DECL_NOTHROW |
1246 |
-+{ |
1247 |
-+ Swap(m); |
1248 |
-+ return *this; |
1249 |
-+} |
1250 |
-+#endif |
1251 |
-+ |
1252 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1253 |
-+void VMeasurement::Swap(VMeasurement &m) Q_DECL_NOTHROW |
1254 |
-+{ |
1255 |
-+ VVariable::Swap(m); |
1256 |
-+ std::swap(d, m.d); |
1257 |
-+} |
1258 |
-+ |
1259 |
- //--------------------------------------------------------------------------------------------------------------------- |
1260 |
- VMeasurement::~VMeasurement() |
1261 |
- {} |
1262 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vmeasurement.h |
1263 |
---- a/src/libs/vpatterndb/variables/vmeasurement.h Sun Dec 29 14:37:46 2019 +0200 |
1264 |
-+++ b/src/libs/vpatterndb/variables/vmeasurement.h Mon Dec 30 13:00:57 2019 +0200 |
1265 |
-@@ -62,11 +62,10 @@ |
1266 |
- |
1267 |
- VMeasurement &operator=(const VMeasurement &m); |
1268 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1269 |
-- VMeasurement &operator=(VMeasurement &&m) Q_DECL_NOTHROW { Swap(m); return *this; } |
1270 |
-+ VMeasurement &operator=(VMeasurement &&m) Q_DECL_NOTHROW; |
1271 |
- #endif |
1272 |
- |
1273 |
-- inline void Swap(VMeasurement &m) Q_DECL_NOTHROW |
1274 |
-- { VVariable::Swap(m); std::swap(d, m.d); } |
1275 |
-+ void Swap(VMeasurement &m) Q_DECL_NOTHROW; |
1276 |
- |
1277 |
- QString GetGuiText() const; |
1278 |
- |
1279 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vvariable.cpp |
1280 |
---- a/src/libs/vpatterndb/variables/vvariable.cpp Sun Dec 29 14:37:46 2019 +0200 |
1281 |
-+++ b/src/libs/vpatterndb/variables/vvariable.cpp Mon Dec 30 13:00:57 2019 +0200 |
1282 |
-@@ -63,6 +63,22 @@ |
1283 |
- return *this; |
1284 |
- } |
1285 |
- |
1286 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1287 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1288 |
-+VVariable &VVariable::operator=(VVariable &&var) Q_DECL_NOTHROW |
1289 |
-+{ |
1290 |
-+ Swap(var); |
1291 |
-+ return *this; |
1292 |
-+} |
1293 |
-+#endif |
1294 |
-+ |
1295 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1296 |
-+void VVariable::Swap(VVariable &var) Q_DECL_NOTHROW |
1297 |
-+{ |
1298 |
-+ VInternalVariable::Swap(var); |
1299 |
-+ std::swap(d, var.d); |
1300 |
-+} |
1301 |
-+ |
1302 |
- //--------------------------------------------------------------------------------------------------------------------- |
1303 |
- VVariable::~VVariable() |
1304 |
- {} |
1305 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/variables/vvariable.h |
1306 |
---- a/src/libs/vpatterndb/variables/vvariable.h Sun Dec 29 14:37:46 2019 +0200 |
1307 |
-+++ b/src/libs/vpatterndb/variables/vvariable.h Mon Dec 30 13:00:57 2019 +0200 |
1308 |
-@@ -52,11 +52,10 @@ |
1309 |
- |
1310 |
- VVariable &operator=(const VVariable &var); |
1311 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1312 |
-- VVariable &operator=(VVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } |
1313 |
-+ VVariable &operator=(VVariable &&var) Q_DECL_NOTHROW; |
1314 |
- #endif |
1315 |
- |
1316 |
-- inline void Swap(VVariable &var) Q_DECL_NOTHROW |
1317 |
-- { VInternalVariable::Swap(var); std::swap(d, var.d); } |
1318 |
-+ void Swap(VVariable &var) Q_DECL_NOTHROW; |
1319 |
- |
1320 |
- QString GetDescription() const; |
1321 |
- void SetDescription(const QString &desc); |
1322 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vcontainer.cpp |
1323 |
---- a/src/libs/vpatterndb/vcontainer.cpp Sun Dec 29 14:37:46 2019 +0200 |
1324 |
-+++ b/src/libs/vpatterndb/vcontainer.cpp Mon Dec 30 13:00:57 2019 +0200 |
1325 |
-@@ -130,6 +130,21 @@ |
1326 |
- return *this; |
1327 |
- } |
1328 |
- |
1329 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1330 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1331 |
-+VContainer &VContainer::operator=(VContainer &&data) Q_DECL_NOTHROW |
1332 |
-+{ |
1333 |
-+ Swap(data); |
1334 |
-+ return *this; |
1335 |
-+} |
1336 |
-+#endif |
1337 |
-+ |
1338 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1339 |
-+void VContainer::Swap(VContainer &data) Q_DECL_NOTHROW |
1340 |
-+{ |
1341 |
-+ std::swap(d, data.d); |
1342 |
-+} |
1343 |
-+ |
1344 |
- //--------------------------------------------------------------------------------------------------------------------- |
1345 |
- /** |
1346 |
- * @brief VContainer create container from another container |
1347 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vcontainer.h |
1348 |
---- a/src/libs/vpatterndb/vcontainer.h Sun Dec 29 14:37:46 2019 +0200 |
1349 |
-+++ b/src/libs/vpatterndb/vcontainer.h Mon Dec 30 13:00:57 2019 +0200 |
1350 |
-@@ -131,11 +131,10 @@ |
1351 |
- |
1352 |
- VContainer &operator=(const VContainer &data); |
1353 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1354 |
-- VContainer &operator=(VContainer &&data) Q_DECL_NOTHROW { Swap(data); return *this; } |
1355 |
-+ VContainer &operator=(VContainer &&data) Q_DECL_NOTHROW; |
1356 |
- #endif |
1357 |
- |
1358 |
-- inline void Swap(VContainer &data) Q_DECL_NOTHROW |
1359 |
-- { std::swap(d, data.d); } |
1360 |
-+ void Swap(VContainer &data) Q_DECL_NOTHROW; |
1361 |
- |
1362 |
- static QString UniqueNamespace(); |
1363 |
- |
1364 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vnodedetail.cpp |
1365 |
---- a/src/libs/vpatterndb/vnodedetail.cpp Sun Dec 29 14:37:46 2019 +0200 |
1366 |
-+++ b/src/libs/vpatterndb/vnodedetail.cpp Mon Dec 30 13:00:57 2019 +0200 |
1367 |
-@@ -122,6 +122,21 @@ |
1368 |
- return *this; |
1369 |
- } |
1370 |
- |
1371 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1372 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1373 |
-+VNodeDetail &VNodeDetail::operator=(VNodeDetail &&node) Q_DECL_NOTHROW |
1374 |
-+{ |
1375 |
-+ Swap(node); |
1376 |
-+ return *this; |
1377 |
-+} |
1378 |
-+#endif |
1379 |
-+ |
1380 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1381 |
-+void VNodeDetail::Swap(VNodeDetail &node) Q_DECL_NOTHROW |
1382 |
-+{ |
1383 |
-+ std::swap(d, node.d); |
1384 |
-+} |
1385 |
-+ |
1386 |
- //--------------------------------------------------------------------------------------------------------------------- |
1387 |
- VNodeDetail::~VNodeDetail() |
1388 |
- {} |
1389 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vnodedetail.h |
1390 |
---- a/src/libs/vpatterndb/vnodedetail.h Sun Dec 29 14:37:46 2019 +0200 |
1391 |
-+++ b/src/libs/vpatterndb/vnodedetail.h Mon Dec 30 13:00:57 2019 +0200 |
1392 |
-@@ -74,11 +74,10 @@ |
1393 |
- */ |
1394 |
- VNodeDetail &operator=(const VNodeDetail &node); |
1395 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1396 |
-- VNodeDetail &operator=(VNodeDetail &&node) Q_DECL_NOTHROW { Swap(node); return *this; } |
1397 |
-+ VNodeDetail &operator=(VNodeDetail &&node) Q_DECL_NOTHROW; |
1398 |
- #endif |
1399 |
- |
1400 |
-- inline void Swap(VNodeDetail &node) Q_DECL_NOTHROW |
1401 |
-- { std::swap(d, node.d); } |
1402 |
-+ void Swap(VNodeDetail &node) Q_DECL_NOTHROW; |
1403 |
- |
1404 |
- /** |
1405 |
- * @brief getId return object id. |
1406 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiece.cpp |
1407 |
---- a/src/libs/vpatterndb/vpiece.cpp Sun Dec 29 14:37:46 2019 +0200 |
1408 |
-+++ b/src/libs/vpatterndb/vpiece.cpp Mon Dec 30 13:00:57 2019 +0200 |
1409 |
-@@ -351,6 +351,22 @@ |
1410 |
- return *this; |
1411 |
- } |
1412 |
- |
1413 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1414 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1415 |
-+VPiece &VPiece::operator=(VPiece &&piece) Q_DECL_NOTHROW |
1416 |
-+{ |
1417 |
-+ Swap(piece); |
1418 |
-+ return *this; |
1419 |
-+} |
1420 |
-+#endif |
1421 |
-+ |
1422 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1423 |
-+void VPiece::Swap(VPiece &piece) Q_DECL_NOTHROW |
1424 |
-+{ |
1425 |
-+ VAbstractPiece::Swap(piece); |
1426 |
-+ std::swap(d, piece.d); |
1427 |
-+} |
1428 |
-+ |
1429 |
- //--------------------------------------------------------------------------------------------------------------------- |
1430 |
- VPiece::~VPiece() |
1431 |
- {} |
1432 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiece.h |
1433 |
---- a/src/libs/vpatterndb/vpiece.h Sun Dec 29 14:37:46 2019 +0200 |
1434 |
-+++ b/src/libs/vpatterndb/vpiece.h Mon Dec 30 13:00:57 2019 +0200 |
1435 |
-@@ -84,11 +84,10 @@ |
1436 |
- |
1437 |
- VPiece &operator=(const VPiece &piece); |
1438 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1439 |
-- VPiece &operator=(VPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; } |
1440 |
-+ VPiece &operator=(VPiece &&piece) Q_DECL_NOTHROW; |
1441 |
- #endif |
1442 |
- |
1443 |
-- inline void Swap(VPiece &piece) Q_DECL_NOTHROW |
1444 |
-- { VAbstractPiece::Swap(piece); std::swap(d, piece.d); } |
1445 |
-+ void Swap(VPiece &piece) Q_DECL_NOTHROW; |
1446 |
- |
1447 |
- VPiecePath GetPath() const; |
1448 |
- VPiecePath &GetPath(); |
1449 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecenode.cpp |
1450 |
---- a/src/libs/vpatterndb/vpiecenode.cpp Sun Dec 29 14:37:46 2019 +0200 |
1451 |
-+++ b/src/libs/vpatterndb/vpiecenode.cpp Mon Dec 30 13:00:57 2019 +0200 |
1452 |
-@@ -91,6 +91,21 @@ |
1453 |
- return *this; |
1454 |
- } |
1455 |
- |
1456 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1457 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1458 |
-+VPieceNode &VPieceNode::operator=(VPieceNode &&node) Q_DECL_NOTHROW |
1459 |
-+{ |
1460 |
-+ Swap(node); |
1461 |
-+ return *this; |
1462 |
-+} |
1463 |
-+#endif |
1464 |
-+ |
1465 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1466 |
-+void VPieceNode::Swap(VPieceNode &node) Q_DECL_NOTHROW |
1467 |
-+{ |
1468 |
-+ std::swap(d, node.d); |
1469 |
-+} |
1470 |
-+ |
1471 |
- //--------------------------------------------------------------------------------------------------------------------- |
1472 |
- VPieceNode::~VPieceNode() |
1473 |
- {} |
1474 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecenode.h |
1475 |
---- a/src/libs/vpatterndb/vpiecenode.h Sun Dec 29 14:37:46 2019 +0200 |
1476 |
-+++ b/src/libs/vpatterndb/vpiecenode.h Mon Dec 30 13:00:57 2019 +0200 |
1477 |
-@@ -49,11 +49,10 @@ |
1478 |
- |
1479 |
- VPieceNode &operator=(const VPieceNode &node); |
1480 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1481 |
-- VPieceNode &operator=(VPieceNode &&node) Q_DECL_NOTHROW { Swap(node); return *this; } |
1482 |
-+ VPieceNode &operator=(VPieceNode &&node) Q_DECL_NOTHROW; |
1483 |
- #endif |
1484 |
- |
1485 |
-- inline void Swap(VPieceNode &node) Q_DECL_NOTHROW |
1486 |
-- { std::swap(d, node.d); } |
1487 |
-+ void Swap(VPieceNode &node) Q_DECL_NOTHROW; |
1488 |
- |
1489 |
- friend QDataStream& operator<<(QDataStream& out, const VPieceNode& p); |
1490 |
- friend QDataStream& operator>>(QDataStream& in, VPieceNode& p); |
1491 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecepath.cpp |
1492 |
---- a/src/libs/vpatterndb/vpiecepath.cpp Sun Dec 29 14:37:46 2019 +0200 |
1493 |
-+++ b/src/libs/vpatterndb/vpiecepath.cpp Mon Dec 30 13:00:57 2019 +0200 |
1494 |
-@@ -217,6 +217,21 @@ |
1495 |
- return *this; |
1496 |
- } |
1497 |
- |
1498 |
-+#ifdef Q_COMPILER_RVALUE_REFS |
1499 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1500 |
-+VPiecePath &VPiecePath::operator=(VPiecePath &&path) Q_DECL_NOTHROW |
1501 |
-+{ |
1502 |
-+ Swap(path); |
1503 |
-+ return *this; |
1504 |
-+} |
1505 |
-+#endif |
1506 |
-+ |
1507 |
-+//--------------------------------------------------------------------------------------------------------------------- |
1508 |
-+void VPiecePath::Swap(VPiecePath &path) Q_DECL_NOTHROW |
1509 |
-+{ |
1510 |
-+ std::swap(d, path.d); |
1511 |
-+} |
1512 |
-+ |
1513 |
- //--------------------------------------------------------------------------------------------------------------------- |
1514 |
- VPiecePath::~VPiecePath() |
1515 |
- {} |
1516 |
-diff -r 065a26d8b577 -r fb8691f522f3 src/libs/vpatterndb/vpiecepath.h |
1517 |
---- a/src/libs/vpatterndb/vpiecepath.h Sun Dec 29 14:37:46 2019 +0200 |
1518 |
-+++ b/src/libs/vpatterndb/vpiecepath.h Mon Dec 30 13:00:57 2019 +0200 |
1519 |
-@@ -54,11 +54,10 @@ |
1520 |
- |
1521 |
- VPiecePath &operator=(const VPiecePath &path); |
1522 |
- #ifdef Q_COMPILER_RVALUE_REFS |
1523 |
-- VPiecePath &operator=(VPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } |
1524 |
-+ VPiecePath &operator=(VPiecePath &&path) Q_DECL_NOTHROW; |
1525 |
- #endif |
1526 |
- |
1527 |
-- inline void Swap(VPiecePath &path) Q_DECL_NOTHROW |
1528 |
-- { std::swap(d, path.d); } |
1529 |
-+ void Swap(VPiecePath &path) Q_DECL_NOTHROW; |
1530 |
- |
1531 |
- void Append(const VPieceNode &node); |
1532 |
- void Clear(); |
1533 |
|
1534 |
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild |
1535 |
similarity index 89% |
1536 |
rename from media-gfx/valentina/valentina-0.6.1.ebuild |
1537 |
rename to media-gfx/valentina/valentina-0.6.1-r1.ebuild |
1538 |
index 9ef76a59c09..f44a566e76f 100644 |
1539 |
--- a/media-gfx/valentina/valentina-0.6.1.ebuild |
1540 |
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild |
1541 |
@@ -1,18 +1,19 @@ |
1542 |
# Copyright 1999-2019 Gentoo Authors |
1543 |
# Distributed under the terms of the GNU General Public License v2 |
1544 |
|
1545 |
-EAPI=6 |
1546 |
+EAPI=7 |
1547 |
|
1548 |
-inherit qmake-utils gnome2-utils xdg-utils |
1549 |
+inherit qmake-utils gnome2-utils xdg |
1550 |
|
1551 |
DESCRIPTION="Cloth patternmaking software" |
1552 |
HOMEPAGE="https://valentinaproject.bitbucket.io/" |
1553 |
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip" |
1554 |
+SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip |
1555 |
+ https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2" |
1556 |
|
1557 |
LICENSE="GPL-3" |
1558 |
SLOT="0" |
1559 |
KEYWORDS="~amd64 ~x86" |
1560 |
-IUSE="gnome" |
1561 |
+IUSE="" |
1562 |
|
1563 |
LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" |
1564 |
|
1565 |
@@ -40,7 +41,7 @@ S=${WORKDIR}/dismine-${PN}-b639b75d1688 |
1566 |
|
1567 |
PATCHES=( |
1568 |
"${FILESDIR}/5823.patch" |
1569 |
- "${FILESDIR}/5858.patch" |
1570 |
+ "${WORKDIR}/valentina-5858.patch" |
1571 |
) |
1572 |
|
1573 |
src_configure() { |
1574 |
@@ -119,12 +120,3 @@ src_install() { |
1575 |
insinto /usr/share/mime/packages |
1576 |
doins dist/debian/${PN}.xml |
1577 |
} |
1578 |
- |
1579 |
-pkg_postinst() { |
1580 |
- xdg_desktop_database_update |
1581 |
- xdg_mimeinfo_database_update |
1582 |
- |
1583 |
- if use gnome ; then |
1584 |
- gnome2_icon_cache_update |
1585 |
- fi |
1586 |
-} |
1587 |
|
1588 |
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild |
1589 |
index 5aaeab21f49..c5691f998ce 100644 |
1590 |
--- a/media-gfx/valentina/valentina-9999.ebuild |
1591 |
+++ b/media-gfx/valentina/valentina-9999.ebuild |
1592 |
@@ -1,9 +1,9 @@ |
1593 |
-# Copyright 1999-2018 Gentoo Authors |
1594 |
+# Copyright 1999-2019 Gentoo Authors |
1595 |
# Distributed under the terms of the GNU General Public License v2 |
1596 |
|
1597 |
-EAPI=6 |
1598 |
+EAPI=7 |
1599 |
|
1600 |
-inherit mercurial qmake-utils gnome2-utils xdg-utils |
1601 |
+inherit mercurial qmake-utils gnome2-utils xdg |
1602 |
|
1603 |
DESCRIPTION="Cloth patternmaking software" |
1604 |
HOMEPAGE="https://valentinaproject.bitbucket.io/" |
1605 |
@@ -13,7 +13,7 @@ EHG_REVISION="develop" |
1606 |
LICENSE="GPL-3" |
1607 |
SLOT="0" |
1608 |
KEYWORDS="" |
1609 |
-IUSE="gnome" |
1610 |
+IUSE="" |
1611 |
|
1612 |
LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" |
1613 |
|
1614 |
@@ -111,12 +111,3 @@ src_install() { |
1615 |
insinto /usr/share/mime/packages |
1616 |
doins dist/debian/${PN}.xml |
1617 |
} |
1618 |
- |
1619 |
-pkg_postinst() { |
1620 |
- xdg_desktop_database_update |
1621 |
- xdg_mimeinfo_database_update |
1622 |
- |
1623 |
- if use gnome ; then |
1624 |
- gnome2_icon_cache_update |
1625 |
- fi |
1626 |
-} |