Mercurial > ldforge2 / file diff

--- a/src/objecttypes/edge.cpp	Sun Nov 03 17:57:21 2019 +0200
+++ b/src/objecttypes/edge.cpp	Sun Nov 03 18:09:47 2019 +0200
@@ -1,21 +1,21 @@
 #include "edge.h"
 
-modelobjects::Edge::Edge(
+linetypes::Edge::Edge(
 	const Vertex& point_1,
 	const Vertex& point_2,
 	const Color color_index) :
-	ColoredBaseObject{color_index},
+	ColoredObject{color_index},
 	point_1{point_1},
 	point_2{point_2} {}
 
-modelobjects::Edge::Edge(const QVector<Vertex>& vertices, const Color color) :
-	ColoredBaseObject{color},
+linetypes::Edge::Edge(const QVector<Vertex>& vertices, const Color color) :
+	ColoredObject{color},
 	point_1{vertices[0]},
 	point_2{vertices[1]}
 {
 }
 
-QVariant modelobjects::Edge::getProperty(Property property) const
+QVariant linetypes::Edge::getProperty(Property property) const
 {
 	switch (property)
 	{
@@ -28,7 +28,7 @@
 	}
 }
 
-auto modelobjects::Edge::setProperty(Property property, const QVariant& value)
+auto linetypes::Edge::setProperty(Property property, const QVariant& value)
 	-> SetPropertyResult
 {
 	switch (property)
@@ -44,7 +44,7 @@
 	}
 }
 
-QString modelobjects::Edge::textRepresentation() const
+QString linetypes::Edge::textRepresentation() const
 {
 	return utility::format("%1 %2", vertexToStringParens(point_1), vertexToStringParens(point_2));
 }