diff -r fe67489523b5 -r 6e838748867b src/objecttypes/conditionaledge.cpp --- a/src/objecttypes/conditionaledge.cpp Sun Nov 03 17:57:21 2019 +0200 +++ b/src/objecttypes/conditionaledge.cpp Sun Nov 03 18:09:47 2019 +0200 @@ -1,6 +1,6 @@ #include "conditionaledge.h" -modelobjects::ConditionalEdge::ConditionalEdge( +linetypes::ConditionalEdge::ConditionalEdge( const Vertex& point_1, const Vertex& point_2, const Vertex& controlPoint_1, @@ -12,14 +12,14 @@ { } -modelobjects::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]} { } -QVariant modelobjects::ConditionalEdge::getProperty(Property property) const +QVariant linetypes::ConditionalEdge::getProperty(Property property) const { switch (property) { @@ -32,7 +32,7 @@ } } -auto modelobjects::ConditionalEdge::setProperty( +auto linetypes::ConditionalEdge::setProperty( Property property, const QVariant& value) -> SetPropertyResult @@ -48,7 +48,7 @@ } } -QString modelobjects::ConditionalEdge::textRepresentation() const +QString linetypes::ConditionalEdge::textRepresentation() const { return Edge::textRepresentation() + utility::format("%1 %2", vertexToStringParens(controlPoint_1),