Mercurial > ldforge / file diff

--- a/src/ldObject.cpp	Fri Feb 10 23:06:24 2017 +0200
+++ b/src/ldObject.cpp	Sun Feb 12 16:02:02 2017 +0200
@@ -270,10 +270,10 @@
 {
 	switch (obj->type())
 	{
-	case OBJ_Line:
-	case OBJ_CondLine:
-	case OBJ_Triangle:
-	case OBJ_Quad:
+	case LDObjectType::Line:
+	case LDObjectType::CondLine:
+	case LDObjectType::Triangle:
+	case LDObjectType::Quad:
 		for (int i = 0; i < obj->numVertices(); ++i)
 		{
 			Vertex v = obj->vertex (i);
@@ -282,7 +282,7 @@
 		}
 		break;
 
-	case OBJ_SubfileReference:
+	case LDObjectType::SubfileReference:
 		{
 			LDSubfileReference* ref = static_cast<LDSubfileReference*> (obj);
 			Matrix newMatrix = transform * ref->transformationMatrix();
@@ -320,10 +320,10 @@
 LDPolygon* LDObject::getPolygon()
 {
 	LDObjectType ot = type();
-	int num = (ot == OBJ_Line)		? 2
-			: (ot == OBJ_Triangle)	? 3
-			: (ot == OBJ_Quad)		? 4
-			: (ot == OBJ_CondLine)	? 5
+	int num = (ot == LDObjectType::Line)		? 2
+			: (ot == LDObjectType::Triangle)	? 3
+			: (ot == LDObjectType::Quad)		? 4
+			: (ot == LDObjectType::CondLine)	? 5
 			: 0;
 
 	if (num == 0)
@@ -419,7 +419,7 @@
 {
 	LDObject* prev = previous();
 
-	if (prev and prev->type() == OBJ_Bfc and static_cast<LDBfc*> (prev)->statement() == BfcStatement::InvertNext)
+	if (prev and prev->type() == LDObjectType::Bfc and static_cast<LDBfc*> (prev)->statement() == BfcStatement::InvertNext)
 	{
 		ptr = static_cast<LDBfc*> (prev);
 		return true;