diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index e51c79ceb..9da59fdab 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -146,9 +146,7 @@ QVector AngleByLength(QVector points, QPointF p1, QPoi loop = QLineF(bigLine1.p1(), sp2); loop.setLength(loop.length() + localWidth); - VRawSAPoint loopPoint(loop.p2()); - loopPoint.SetLoopPoint(true); - points.append(loopPoint); + points.append(VRawSAPoint(loop.p2(), true)); } else { @@ -1460,9 +1458,7 @@ QT_WARNING_POP loop = QLineF(crosPoint, bigLine1.p1()); loop.setLength(loop.length() + localWidth*2.); - VRawSAPoint loopPoint(loop.p2()); - loopPoint.SetLoopPoint(true); - points.append(loopPoint); + points.append(VRawSAPoint(loop.p2(), true)); } return points; diff --git a/src/libs/vlayout/vrawsapoint.h b/src/libs/vlayout/vrawsapoint.h index 0a00e413c..fbd5dd6d7 100644 --- a/src/libs/vlayout/vrawsapoint.h +++ b/src/libs/vlayout/vrawsapoint.h @@ -44,6 +44,7 @@ public: Q_DECL_CONSTEXPR VRawSAPoint(qreal xpos, qreal ypos); // cppcheck-suppress noExplicitConstructor Q_DECL_CONSTEXPR VRawSAPoint(QPointF p); + Q_DECL_CONSTEXPR VRawSAPoint(QPointF p, bool loopPoint); Q_DECL_CONSTEXPR bool LoopPoint() const; Q_DECL_RELAXED_CONSTEXPR void SetLoopPoint(bool loopPoint); @@ -70,9 +71,14 @@ Q_DECL_CONSTEXPR inline VRawSAPoint::VRawSAPoint(qreal xpos, qreal ypos) // cppcheck-suppress passedByValue Q_DECL_CONSTEXPR inline VRawSAPoint::VRawSAPoint(QPointF p) : QPointF(p) -{ +{} -} +//--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress passedByValue +Q_DECL_CONSTEXPR inline VRawSAPoint::VRawSAPoint(QPointF p, bool loopPoint) + : QPointF(p), + m_loopPoint(loopPoint) +{} //--------------------------------------------------------------------------------------------------------------------- Q_DECL_CONSTEXPR inline bool VRawSAPoint::LoopPoint() const