Mercurial > ldforge2 / file diff

--- a/src/linetypes/conditionaledge.cpp	Tue Jan 28 23:34:49 2020 +0200
+++ b/src/linetypes/conditionaledge.cpp	Thu Jan 30 19:20:11 2020 +0200
@@ -1,6 +1,6 @@
 #include "conditionaledge.h"
 
-linetypes::ConditionalEdge::ConditionalEdge(
+ldraw::ConditionalEdge::ConditionalEdge(
 	const glm::vec3& point_1,
 	const glm::vec3& point_2,
 	const glm::vec3& controlPoint_1,
@@ -12,14 +12,14 @@
 {
 }
 
-linetypes::ConditionalEdge::ConditionalEdge(const QVector<glm::vec3>& vertices, const Color color) :
+ldraw::ConditionalEdge::ConditionalEdge(const QVector<glm::vec3>& vertices, const Color color) :
 	Edge{vertices[0], vertices[1], color},
 	controlPoint_1{vertices[2]},
 	controlPoint_2{vertices[3]}
 {
 }
 
-QVariant linetypes::ConditionalEdge::getProperty(Property property) const
+QVariant ldraw::ConditionalEdge::getProperty(Property property) const
 {
 	switch (property)
 	{
@@ -32,7 +32,7 @@
 	}
 }
 
-auto linetypes::ConditionalEdge::setProperty(
+auto ldraw::ConditionalEdge::setProperty(
 	Property property,
 	const QVariant& value)
 	-> SetPropertyResult
@@ -48,7 +48,7 @@
 	}
 }
 
-QString linetypes::ConditionalEdge::textRepresentation() const
+QString ldraw::ConditionalEdge::textRepresentation() const
 {
 	return Edge::textRepresentation() + utility::format("%1 %2",
 		utility::vertexToStringParens(controlPoint_1),