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