diff -r a5111f4e6412 -r 918b6c0f8b5b src/linetypes/conditionaledge.cpp --- a/src/linetypes/conditionaledge.cpp Fri Dec 13 15:55:56 2019 +0200 +++ b/src/linetypes/conditionaledge.cpp Fri Dec 13 21:35:59 2019 +0200 @@ -1,10 +1,10 @@ #include "conditionaledge.h" linetypes::ConditionalEdge::ConditionalEdge( - const Vertex& point_1, - const Vertex& point_2, - const Vertex& controlPoint_1, - const Vertex& controlPoint_2, + const Point3D& point_1, + const Point3D& point_2, + const Point3D& controlPoint_1, + const Point3D& controlPoint_2, const Color color_index) : Edge{point_1, point_2, color_index}, controlPoint_1{controlPoint_1}, @@ -12,7 +12,7 @@ { } -linetypes::ConditionalEdge::ConditionalEdge(const QVector& vertices, const Color color) : +linetypes::ConditionalEdge::ConditionalEdge(const QVector& vertices, const Color color) : Edge{vertices[0], vertices[1], color}, controlPoint_1{vertices[2]}, controlPoint_2{vertices[3]} @@ -40,9 +40,9 @@ switch (property) { case Property::ControlPoint1: - controlPoint_1 = value.value(); + controlPoint_1 = value.value(); case Property::ControlPoint2: - controlPoint_2 = value.value(); + controlPoint_2 = value.value(); default: return Edge::setProperty(property, value); }