diff -r 4bec0525ef1b -r 93ec4d630346 src/linetypes/conditionaledge.h --- a/src/linetypes/conditionaledge.h Thu Mar 19 21:06:06 2020 +0200 +++ b/src/linetypes/conditionaledge.h Wed Mar 25 16:07:20 2020 +0200 @@ -6,23 +6,9 @@ class ConditionalEdge; } -class ldraw::ConditionalEdge : public Edge +class ldraw::ConditionalEdge : public PolygonObject<4> { public: - ConditionalEdge() = default; - ConditionalEdge( - const glm::vec3& point_1, - const glm::vec3& point_2, - const glm::vec3& controlPoint_1, - const glm::vec3& controlPoint_2, - const Color colorIndex = ldraw::edgeColor); - ConditionalEdge(const std::array& vertices, const Color color); - QVariant getProperty(Property property) const override; + using PolygonObject<4>::PolygonObject; QString textRepresentation() const override; - int numPoints() const override; - const glm::vec3& getPoint(int index) const override; - glm::vec3 controlPoint_1 = {}; - glm::vec3 controlPoint_2 = {}; -protected: - void setProperty(SetPropertyResult* result, const PropertyKeyValue& pair) override; };