Mercurial > ldforge2 / file diff

--- a/src/objecttypes/polygon.h	Sun Nov 03 17:57:21 2019 +0200
+++ b/src/objecttypes/polygon.h	Sun Nov 03 18:09:47 2019 +0200
@@ -1,13 +1,13 @@
 #include <array>
 #include "modelobject.h"
 
-namespace modelobjects
+namespace linetypes
 {
 	class Triangle;
 	class Quadrilateral;
 }
 
-class modelobjects::Triangle : public ColoredBaseObject
+class linetypes::Triangle : public ColoredObject
 {
 public:
 	Triangle() = default;
@@ -15,7 +15,7 @@
 		const Vertex &point_1,
 		const Vertex &point_2,
 		const Vertex &point_3,
-		Color color_index = colors::main);
+		Color colorIndex = colors::main);
 	Triangle(const QVector<Vertex>& vertices, const Color color);
 	QVariant getProperty(Property id) const override;
 	SetPropertyResult setProperty(Property id, const QVariant& value) override;
@@ -24,7 +24,7 @@
 	Vertex points[3] = {{}};
 };
 
-class modelobjects::Quadrilateral : public ColoredBaseObject
+class linetypes::Quadrilateral : public ColoredObject
 {
 public:
 	Quadrilateral() = default;
@@ -33,7 +33,7 @@
 		const Vertex &point_2,
 		const Vertex &point_3,
 		const Vertex &point_4,
-		Color color_index = colors::main);
+		Color colorIndex = colors::main);
 	Quadrilateral(const QVector<Vertex>& vertices, const Color color);
 	QVariant getProperty(Property id) const override;
 	SetPropertyResult setProperty(Property id, const QVariant& value) override;