From 24245bf7596a549452cd7b1b47d09960e5bb1c7a Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 6 Mar 2014 17:28:31 +0200 Subject: [PATCH] Cppcheck. --HG-- branch : feature --- src/geometry/vequidistant.cpp | 6 +++--- src/geometry/vequidistant.h | 6 +++--- src/tools/drawTools/vtoolcutsplinepath.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/geometry/vequidistant.cpp b/src/geometry/vequidistant.cpp index 285a6eecd..13c763c8d 100644 --- a/src/geometry/vequidistant.cpp +++ b/src/geometry/vequidistant.cpp @@ -229,7 +229,7 @@ QVector VEquidistant::CorrectEquidistantPoints(const QVector & } QPainterPath VEquidistant::Equidistant(QVector points, const Detail::Equidistant &eqv, - const qreal &width) const + const qreal &width) { QPainterPath ekv; QVector ekvPoints; @@ -364,7 +364,7 @@ QVector VEquidistant::GetReversePoint(const QVector &points) return reversePoints; } -QVector VEquidistant::EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width) const +QVector VEquidistant::EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width) { Q_ASSERT(width > 0); QVector points; @@ -413,7 +413,7 @@ QVector VEquidistant::EkvPoint(const QLineF &line1, const QLineF &line2 return points; } -QLineF VEquidistant::ParallelLine(const QLineF &line, qreal width) const +QLineF VEquidistant::ParallelLine(const QLineF &line, qreal width) { Q_ASSERT(width > 0); QLineF paralel = QLineF (SingleParallelPoint(line, 90, width), SingleParallelPoint(QLineF(line.p2(), line.p1()), diff --git a/src/geometry/vequidistant.h b/src/geometry/vequidistant.h index 2d261a0f4..13830858b 100644 --- a/src/geometry/vequidistant.h +++ b/src/geometry/vequidistant.h @@ -74,7 +74,7 @@ private: * @param width width of equidistant. * @return return painter path of equidistant. */ - QPainterPath Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width) const; + static QPainterPath Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width); /** * @brief CheckLoops seek and delete loops in equidistant. * @param points vector of points of equidistant. @@ -94,14 +94,14 @@ private: * @param width width of equidistant. * @return vector of points. */ - QVector EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width) const; + static QVector EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width); /** * @brief ParallelLine create parallel line. * @param line starting line. * @param width width to parallel line. * @return parallel line. */ - QLineF ParallelLine(const QLineF &line, qreal width ) const; + static QLineF ParallelLine(const QLineF &line, qreal width ); /** * @brief SingleParallelPoint return point of parallel line. * @param line starting line. diff --git a/src/tools/drawTools/vtoolcutsplinepath.cpp b/src/tools/drawTools/vtoolcutsplinepath.cpp index ab4d1159f..138d4dd0b 100644 --- a/src/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/tools/drawTools/vtoolcutsplinepath.cpp @@ -119,8 +119,8 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, con quint32 splPath1id = id + 1; quint32 splPath2id = id + 2; - const VSplinePoint splP1 = splPath->at(p1); - const VSplinePoint splP2 = splPath->at(p2); + VSplinePoint splP1 = splPath->at(p1); + VSplinePoint splP2 = splPath->at(p2); const VSpline spl1 = VSpline(splP1.P(), spl1p2, spl1p3, *p, splPath->getKCurve()); const VSpline spl2 = VSpline(*p, spl2p2, spl2p3, splP2.P(), splPath->getKCurve());