diff --git a/src/libs/vgeometry/vabstractarc.h b/src/libs/vgeometry/vabstractarc.h index d91671920..a6ff51f93 100644 --- a/src/libs/vgeometry/vabstractarc.h +++ b/src/libs/vgeometry/vabstractarc.h @@ -61,7 +61,7 @@ public: VAbstractArc &operator=(VAbstractArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } #endif - void Swap(VAbstractArc &arc) Q_DECL_NOTHROW + inline void Swap(VAbstractArc &arc) Q_DECL_NOTHROW { VAbstractCurve::Swap(arc); std::swap(d, arc.d); } QString GetFormulaF1 () const; diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h index 5e7c7c0f6..e91514e26 100644 --- a/src/libs/vgeometry/vabstractcurve.h +++ b/src/libs/vgeometry/vabstractcurve.h @@ -60,7 +60,7 @@ public: VAbstractCurve &operator=(VAbstractCurve &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } #endif - void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW + inline void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW { VGObject::Swap(curve); std::swap(d, curve.d); } virtual QVector GetPoints() const =0; diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h index 2efa52d32..7c17504e4 100644 --- a/src/libs/vgeometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -69,7 +69,7 @@ public: VArc &operator=(VArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } #endif - void Swap(VArc &arc) Q_DECL_NOTHROW + inline void Swap(VArc &arc) Q_DECL_NOTHROW { VAbstractArc::Swap(arc); std::swap(d, arc.d); } QString GetFormulaRadius () const; diff --git a/src/libs/vgeometry/vcubicbezier.h b/src/libs/vgeometry/vcubicbezier.h index e71a1d824..392cf9880 100644 --- a/src/libs/vgeometry/vcubicbezier.h +++ b/src/libs/vgeometry/vcubicbezier.h @@ -60,7 +60,7 @@ public: VCubicBezier &operator=(VCubicBezier &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } #endif - void Swap(VCubicBezier &curve) Q_DECL_NOTHROW + inline void Swap(VCubicBezier &curve) Q_DECL_NOTHROW { VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); } virtual VPointF GetP1() const Q_DECL_OVERRIDE; diff --git a/src/libs/vgeometry/vcubicbezierpath.h b/src/libs/vgeometry/vcubicbezierpath.h index ec4045d33..d3f6d7502 100644 --- a/src/libs/vgeometry/vcubicbezierpath.h +++ b/src/libs/vgeometry/vcubicbezierpath.h @@ -61,7 +61,7 @@ public: VCubicBezierPath &operator=(VCubicBezierPath &&curve) Q_DECL_NOTHROW { Swap(curve); return *this; } #endif - void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW + inline void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW { VAbstractCubicBezierPath::Swap(curve); std::swap(d, curve.d); } VPointF &operator[](int indx); diff --git a/src/libs/vgeometry/vellipticalarc.h b/src/libs/vgeometry/vellipticalarc.h index 31c04dd01..b41013123 100644 --- a/src/libs/vgeometry/vellipticalarc.h +++ b/src/libs/vgeometry/vellipticalarc.h @@ -72,7 +72,7 @@ public: VEllipticalArc &operator=(VEllipticalArc &&arc) Q_DECL_NOTHROW { Swap(arc); return *this; } #endif - void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW + inline void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW { VAbstractArc::Swap(arc); std::swap(d, arc.d); } QString GetFormulaRotationAngle () const; diff --git a/src/libs/vgeometry/vgobject.h b/src/libs/vgeometry/vgobject.h index 7d6452bc3..5242169d6 100644 --- a/src/libs/vgeometry/vgobject.h +++ b/src/libs/vgeometry/vgobject.h @@ -61,7 +61,7 @@ public: VGObject &operator=(VGObject &&obj) Q_DECL_NOTHROW { Swap(obj); return *this; } #endif - void Swap(VGObject &obj) Q_DECL_NOTHROW + inline void Swap(VGObject &obj) Q_DECL_NOTHROW { std::swap(d, obj.d); } quint32 getIdObject() const; diff --git a/src/libs/vgeometry/vplacelabelitem.h b/src/libs/vgeometry/vplacelabelitem.h index d63e423d8..e5e3cb7bb 100644 --- a/src/libs/vgeometry/vplacelabelitem.h +++ b/src/libs/vgeometry/vplacelabelitem.h @@ -50,7 +50,7 @@ public: VPlaceLabelItem &operator=(VPlaceLabelItem &&item) Q_DECL_NOTHROW { Swap(item); return *this; } #endif - void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW + inline void Swap(VPlaceLabelItem &item) Q_DECL_NOTHROW { VPointF::Swap(item); std::swap(d, item.d); } QString GetWidthFormula() const; diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h index 8528204fd..f30c77d6b 100644 --- a/src/libs/vgeometry/vpointf.h +++ b/src/libs/vgeometry/vpointf.h @@ -65,7 +65,7 @@ public: VPointF &operator=(VPointF &&point) Q_DECL_NOTHROW { Swap(point); return *this; } #endif - void Swap(VPointF &point) Q_DECL_NOTHROW + inline void Swap(VPointF &point) Q_DECL_NOTHROW { VGObject::Swap(point); std::swap(d, point.d); } explicit operator QPointF() const; diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h index 9b9a84303..ead44bfd6 100644 --- a/src/libs/vgeometry/vspline.h +++ b/src/libs/vgeometry/vspline.h @@ -70,7 +70,7 @@ public: VSpline &operator=(VSpline &&spline) Q_DECL_NOTHROW { Swap(spline); return *this; } #endif - void Swap(VSpline &spline) Q_DECL_NOTHROW + inline void Swap(VSpline &spline) Q_DECL_NOTHROW { VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); } virtual VPointF GetP1 () const Q_DECL_OVERRIDE; diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h index eeafa3b69..be5c75890 100644 --- a/src/libs/vgeometry/vsplinepath.h +++ b/src/libs/vgeometry/vsplinepath.h @@ -70,7 +70,7 @@ public: VSplinePath &operator=(VSplinePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } #endif - void Swap(VSplinePath &path) Q_DECL_NOTHROW + inline void Swap(VSplinePath &path) Q_DECL_NOTHROW { VAbstractCubicBezierPath::Swap(path); std::swap(d, path.d); } void append(const VSplinePoint &point); diff --git a/src/libs/vgeometry/vsplinepoint.h b/src/libs/vgeometry/vsplinepoint.h index 67ff58a03..328ef2d96 100644 --- a/src/libs/vgeometry/vsplinepoint.h +++ b/src/libs/vgeometry/vsplinepoint.h @@ -56,7 +56,7 @@ public: VFSplinePoint &operator=(VFSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; } #endif - void Swap(VFSplinePoint &point) Q_DECL_NOTHROW + inline void Swap(VFSplinePoint &point) Q_DECL_NOTHROW { std::swap(d, point.d); } VPointF P() const; @@ -96,7 +96,7 @@ public: VSplinePoint &operator=(VSplinePoint &&point) Q_DECL_NOTHROW { Swap(point); return *this; } #endif - void Swap(VSplinePoint &point) Q_DECL_NOTHROW + inline void Swap(VSplinePoint &point) Q_DECL_NOTHROW { std::swap(d, point.d); } VPointF P() const; diff --git a/src/libs/vlayout/vabstractpiece.h b/src/libs/vlayout/vabstractpiece.h index 9c9cd02c2..88766f3ff 100644 --- a/src/libs/vlayout/vabstractpiece.h +++ b/src/libs/vlayout/vabstractpiece.h @@ -151,7 +151,7 @@ public: VAbstractPiece &operator=(VAbstractPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; } #endif - void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW + inline void Swap(VAbstractPiece &piece) Q_DECL_NOTHROW { std::swap(d, piece.d); } QString GetName() const; diff --git a/src/libs/vlayout/vcontour.h b/src/libs/vlayout/vcontour.h index 4921ccbde..0ea60e5a4 100644 --- a/src/libs/vlayout/vcontour.h +++ b/src/libs/vlayout/vcontour.h @@ -58,7 +58,7 @@ public: VContour &operator=(VContour &&contour) Q_DECL_NOTHROW { Swap(contour); return *this; } #endif - void Swap(VContour &contour) Q_DECL_NOTHROW + inline void Swap(VContour &contour) Q_DECL_NOTHROW { std::swap(d, contour.d); } void SetContour(const QVector &contour); diff --git a/src/libs/vlayout/vlayoutpaper.h b/src/libs/vlayout/vlayoutpaper.h index 2f21fb427..baebdc800 100644 --- a/src/libs/vlayout/vlayoutpaper.h +++ b/src/libs/vlayout/vlayoutpaper.h @@ -60,7 +60,7 @@ public: VLayoutPaper &operator=(VLayoutPaper &&paper) Q_DECL_NOTHROW { Swap(paper); return *this; } #endif - void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW + inline void Swap(VLayoutPaper &paper) Q_DECL_NOTHROW { std::swap(d, paper.d); } int GetHeight() const; diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h index 396b0b8ad..20e6209ad 100644 --- a/src/libs/vlayout/vlayoutpiece.h +++ b/src/libs/vlayout/vlayoutpiece.h @@ -68,7 +68,7 @@ public: VLayoutPiece &operator=(VLayoutPiece &&detail) Q_DECL_NOTHROW { Swap(detail); return *this; } #endif - void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW + inline void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW { VAbstractPiece::Swap(detail); std::swap(d, detail.d); } static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern); diff --git a/src/libs/vlayout/vlayoutpiecepath.h b/src/libs/vlayout/vlayoutpiecepath.h index 9cd0e02da..47e37a7e9 100644 --- a/src/libs/vlayout/vlayoutpiecepath.h +++ b/src/libs/vlayout/vlayoutpiecepath.h @@ -49,7 +49,7 @@ public: VLayoutPiecePath &operator=(VLayoutPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } #endif - void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW + inline void Swap(VLayoutPiecePath &path) Q_DECL_NOTHROW { std::swap(d, path.d); } QPainterPath GetPainterPath() const; diff --git a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h index 63ed75c83..80d53194a 100644 --- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h +++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata.h @@ -47,7 +47,7 @@ public: VAbstractFloatItemData &operator=(VAbstractFloatItemData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } #endif - void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW + inline void Swap(VAbstractFloatItemData &data) Q_DECL_NOTHROW { std::swap(d, data.d); } // methods, which set and return values of different parameters diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h index a007416c1..94c09bf60 100644 --- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h +++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h @@ -54,7 +54,7 @@ public: VGrainlineData &operator=(VGrainlineData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } #endif - void Swap(VGrainlineData &data) Q_DECL_NOTHROW + inline void Swap(VGrainlineData &data) Q_DECL_NOTHROW { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); } // methods, which set and return values of different parameters diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h index 1974dcbcf..589be790b 100644 --- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h +++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h @@ -51,7 +51,7 @@ public: VPatternLabelData &operator=(VPatternLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } #endif - void Swap(VPatternLabelData &data) Q_DECL_NOTHROW + inline void Swap(VPatternLabelData &data) Q_DECL_NOTHROW { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); } // methods, which set up label parameters diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h index d02983273..e88abbf51 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h @@ -54,7 +54,7 @@ public: VPieceLabelData &operator=(VPieceLabelData &&data) Q_DECL_NOTHROW { Swap(data); return *this; } #endif - void Swap(VPieceLabelData &data) Q_DECL_NOTHROW + inline void Swap(VPieceLabelData &data) Q_DECL_NOTHROW { VPatternLabelData::Swap(data); std::swap(d, data.d); } void Clear(); diff --git a/src/libs/vpatterndb/variables/vcurvevariable.h b/src/libs/vpatterndb/variables/vcurvevariable.h index 000d2b84c..a54e7fe6b 100644 --- a/src/libs/vpatterndb/variables/vcurvevariable.h +++ b/src/libs/vpatterndb/variables/vcurvevariable.h @@ -52,7 +52,7 @@ public: VCurveVariable &operator=(VCurveVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } #endif - void Swap(VCurveVariable &var) Q_DECL_NOTHROW + inline void Swap(VCurveVariable &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; diff --git a/src/libs/vpatterndb/variables/vincrement.h b/src/libs/vpatterndb/variables/vincrement.h index 7fd8c35b5..7af5e3ea7 100644 --- a/src/libs/vpatterndb/variables/vincrement.h +++ b/src/libs/vpatterndb/variables/vincrement.h @@ -58,7 +58,7 @@ public: VIncrement &operator=(VIncrement &&incr) Q_DECL_NOTHROW { Swap(incr); return *this; } #endif - void Swap(VIncrement &incr) Q_DECL_NOTHROW + inline void Swap(VIncrement &incr) Q_DECL_NOTHROW { VVariable::Swap(incr); std::swap(d, incr.d); } quint32 getIndex() const; diff --git a/src/libs/vpatterndb/variables/vinternalvariable.h b/src/libs/vpatterndb/variables/vinternalvariable.h index d5d1ed690..41a95e8d1 100644 --- a/src/libs/vpatterndb/variables/vinternalvariable.h +++ b/src/libs/vpatterndb/variables/vinternalvariable.h @@ -51,7 +51,7 @@ public: VInternalVariable &operator=(VInternalVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } #endif - void Swap(VInternalVariable &var) Q_DECL_NOTHROW + inline void Swap(VInternalVariable &var) Q_DECL_NOTHROW { std::swap(d, var.d); } virtual qreal GetValue() const; diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h index bc642156a..faeb38497 100644 --- a/src/libs/vpatterndb/variables/vlineangle.h +++ b/src/libs/vpatterndb/variables/vlineangle.h @@ -53,7 +53,7 @@ public: VLineAngle &operator=(VLineAngle &&var) Q_DECL_NOTHROW { Swap(var); return *this; } #endif - void Swap(VLineAngle &var) Q_DECL_NOTHROW + inline void Swap(VLineAngle &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h index b82dc13b3..fdb012453 100644 --- a/src/libs/vpatterndb/variables/vlinelength.h +++ b/src/libs/vpatterndb/variables/vlinelength.h @@ -55,7 +55,7 @@ public: VLengthLine &operator=(VLengthLine &&var) Q_DECL_NOTHROW { Swap(var); return *this; } #endif - void Swap(VLengthLine &var) Q_DECL_NOTHROW + inline void Swap(VLengthLine &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h index a87689178..f2e2773e5 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.h +++ b/src/libs/vpatterndb/variables/vmeasurement.h @@ -65,7 +65,7 @@ public: VMeasurement &operator=(VMeasurement &&m) Q_DECL_NOTHROW { Swap(m); return *this; } #endif - void Swap(VMeasurement &m) Q_DECL_NOTHROW + inline void Swap(VMeasurement &m) Q_DECL_NOTHROW { VVariable::Swap(m); std::swap(d, m.d); } QString GetGuiText() const; diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h index 1e1d4dc7b..74e0f00e0 100644 --- a/src/libs/vpatterndb/variables/vvariable.h +++ b/src/libs/vpatterndb/variables/vvariable.h @@ -55,7 +55,7 @@ public: VVariable &operator=(VVariable &&var) Q_DECL_NOTHROW { Swap(var); return *this; } #endif - void Swap(VVariable &var) Q_DECL_NOTHROW + inline void Swap(VVariable &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } QString GetDescription() const; diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index a64556faf..c2059e860 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/src/libs/vpatterndb/vcontainer.h @@ -127,7 +127,7 @@ public: VContainer &operator=(VContainer &&data) Q_DECL_NOTHROW { Swap(data); return *this; } #endif - void Swap(VContainer &data) Q_DECL_NOTHROW + inline void Swap(VContainer &data) Q_DECL_NOTHROW { std::swap(d, data.d); } template diff --git a/src/libs/vpatterndb/vnodedetail.h b/src/libs/vpatterndb/vnodedetail.h index 8c04ce6f8..3aee56fac 100644 --- a/src/libs/vpatterndb/vnodedetail.h +++ b/src/libs/vpatterndb/vnodedetail.h @@ -77,7 +77,7 @@ public: VNodeDetail &operator=(VNodeDetail &&node) Q_DECL_NOTHROW { Swap(node); return *this; } #endif - void Swap(VNodeDetail &node) Q_DECL_NOTHROW + inline void Swap(VNodeDetail &node) Q_DECL_NOTHROW { std::swap(d, node.d); } /** diff --git a/src/libs/vpatterndb/vpiece.h b/src/libs/vpatterndb/vpiece.h index 9ea26cc95..5f751fbb5 100644 --- a/src/libs/vpatterndb/vpiece.h +++ b/src/libs/vpatterndb/vpiece.h @@ -60,7 +60,7 @@ public: VPiece &operator=(VPiece &&piece) Q_DECL_NOTHROW { Swap(piece); return *this; } #endif - void Swap(VPiece &piece) Q_DECL_NOTHROW + inline void Swap(VPiece &piece) Q_DECL_NOTHROW { VAbstractPiece::Swap(piece); std::swap(d, piece.d); } VPiecePath GetPath() const; diff --git a/src/libs/vpatterndb/vpiecenode.h b/src/libs/vpatterndb/vpiecenode.h index 6754aed07..edc1a7efa 100644 --- a/src/libs/vpatterndb/vpiecenode.h +++ b/src/libs/vpatterndb/vpiecenode.h @@ -52,7 +52,7 @@ public: VPieceNode &operator=(VPieceNode &&node) Q_DECL_NOTHROW { Swap(node); return *this; } #endif - void Swap(VPieceNode &node) Q_DECL_NOTHROW + inline void Swap(VPieceNode &node) Q_DECL_NOTHROW { std::swap(d, node.d); } friend QDataStream& operator<<(QDataStream& out, const VPieceNode& p); diff --git a/src/libs/vpatterndb/vpiecepath.h b/src/libs/vpatterndb/vpiecepath.h index a107a4eeb..b4a3b8a32 100644 --- a/src/libs/vpatterndb/vpiecepath.h +++ b/src/libs/vpatterndb/vpiecepath.h @@ -57,7 +57,7 @@ public: VPiecePath &operator=(VPiecePath &&path) Q_DECL_NOTHROW { Swap(path); return *this; } #endif - void Swap(VPiecePath &path) Q_DECL_NOTHROW + inline void Swap(VPiecePath &path) Q_DECL_NOTHROW { std::swap(d, path.d); } void Append(const VPieceNode &node);