diff -r 1de2b8d64e9f -r 98906a94732f src/linetypes/triangle.h --- a/src/linetypes/triangle.h Tue Jan 28 23:34:49 2020 +0200 +++ b/src/linetypes/triangle.h Thu Jan 30 19:20:11 2020 +0200 @@ -1,11 +1,11 @@ #include "object.h" -namespace linetypes +namespace ldraw { class Triangle; } -class linetypes::Triangle : public ColoredObject +class ldraw::Triangle : public ColoredObject { public: Triangle() = default; @@ -13,7 +13,7 @@ const glm::vec3 &point_1, const glm::vec3 &point_2, const glm::vec3 &point_3, - Color colorIndex = colors::main); + Color colorIndex = ldraw::mainColor); Triangle(const QVector& vertices, const Color color); QVariant getProperty(Property id) const override; SetPropertyResult setProperty(Property id, const QVariant& value) override;