From 4eaf556342b1eeb2c6dd0e9388242f71ed7c99fb Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 2 Apr 2018 17:05:53 +0300 Subject: [PATCH] Cppcheck warning. --HG-- branch : develop --- src/libs/vpatterndb/vpiece.cpp | 4 ++-- src/libs/vpatterndb/vpiece.h | 5 +++-- src/libs/vtools/visualization/path/vistoolpiece.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index c6354948e..e7adc718a 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -472,11 +472,11 @@ QVector VPiece::CurvesPainterPath(const VContainer *data) const //--------------------------------------------------------------------------------------------------------------------- QPainterPath VPiece::MainPathPath(const VContainer *data) const { - return MainPathPath(MainPathPoints(data)); + return VPiece::MainPathPath(MainPathPoints(data)); } //--------------------------------------------------------------------------------------------------------------------- -QPainterPath VPiece::MainPathPath(const QVector &points) const +QPainterPath VPiece::MainPathPath(const QVector &points) { QPainterPath path; diff --git a/src/libs/vpatterndb/vpiece.h b/src/libs/vpatterndb/vpiece.h index b372c7056..9ea26cc95 100644 --- a/src/libs/vpatterndb/vpiece.h +++ b/src/libs/vpatterndb/vpiece.h @@ -76,8 +76,9 @@ public: QVector CurvesPainterPath(const VContainer *data) const; - QPainterPath MainPathPath(const VContainer *data) const; - QPainterPath MainPathPath(const QVector &points) const; + QPainterPath MainPathPath(const VContainer *data) const; + static QPainterPath MainPathPath(const QVector &points); + QPainterPath SeamAllowancePath(const VContainer *data) const; QPainterPath SeamAllowancePath(const QVector &points) const; QPainterPath PassmarksPath(const VContainer *data, diff --git a/src/libs/vtools/visualization/path/vistoolpiece.cpp b/src/libs/vtools/visualization/path/vistoolpiece.cpp index 256950208..2065e5ec5 100644 --- a/src/libs/vtools/visualization/path/vistoolpiece.cpp +++ b/src/libs/vtools/visualization/path/vistoolpiece.cpp @@ -63,7 +63,7 @@ void VisToolPiece::RefreshGeometry() { m_cachedCurvesPath = m_piece.CurvesPainterPath(Visualization::data); m_cachedMainPathPoints = m_piece.MainPathPoints(Visualization::data); - m_cachedMainPath = m_piece.MainPathPath(m_cachedMainPathPoints); + m_cachedMainPath = VPiece::MainPathPath(m_cachedMainPathPoints); } else {