diff --git a/src/app/container/calculator.h b/src/app/container/calculator.h index c71cae22b..c00cb2360 100644 --- a/src/app/container/calculator.h +++ b/src/app/container/calculator.h @@ -68,7 +68,7 @@ private: static qreal* AddVariable(const QString &a_szName, void *a_pUserData); void SetSepForEval(); void SetSepForTr(bool fromUser); - void RemoveAll(QMap &map, const QString &val); + static void RemoveAll(QMap &map, const QString &val); }; #endif // CALCULATOR_H diff --git a/src/app/geometry/vabstractcurve.cpp b/src/app/geometry/vabstractcurve.cpp index dc9297ed2..d91ca5ed6 100644 --- a/src/app/geometry/vabstractcurve.cpp +++ b/src/app/geometry/vabstractcurve.cpp @@ -90,8 +90,7 @@ QVector VAbstractCurve::IntersectLine(const QLineF &line) const for ( qint32 i = 0; i < points.count()-1; ++i ) { QPointF crosPoint; - QLineF::IntersectType type = QLineF::NoIntersection; - type = line.intersect(QLineF ( points.at(i), points.at(i+1)), &crosPoint); + QLineF::IntersectType type = line.intersect(QLineF ( points.at(i), points.at(i+1)), &crosPoint); if ( type == QLineF::BoundedIntersection ) { intersections.append(crosPoint);