Mercurial > ldforge / file diff

--- a/src/ldtypes.cpp	Wed Oct 16 16:40:42 2013 +0300
+++ b/src/ldtypes.cpp	Wed Oct 16 16:47:40 2013 +0300
@@ -30,7 +30,7 @@
 cfg (Int, ld_defaultlicense, 0);
 
 // List of all LDObjects
-List<LDObject*> g_LDObjects;
+QList<LDObject*> g_LDObjects;
 
 // =============================================================================
 // LDObject constructors
@@ -192,7 +192,7 @@
 
 // =============================================================================
 // -----------------------------------------------------------------------------
-List<LDTriangle*> LDQuad::splitToTriangles()
+QList<LDTriangle*> LDQuad::splitToTriangles()
 {	// Create the two triangles based on this quadrilateral:
 	// 0---3       0---3    3
 	// |   |       |  /    /|
@@ -206,7 +206,7 @@
 	tri1->setColor (color());
 	tri2->setColor (color());
 
-	List<LDTriangle*> triangles;
+	QList<LDTriangle*> triangles;
 	triangles << tri1;
 	triangles << tri2;
 	return triangles;
@@ -300,8 +300,8 @@
 
 // =============================================================================
 // -----------------------------------------------------------------------------
-List<LDObject*> LDSubfile::inlineContents (InlineFlags flags)
-{	List<LDObject*> objs = fileInfo()->inlineContents (flags);
+QList<LDObject*> LDSubfile::inlineContents (InlineFlags flags)
+{	QList<LDObject*> objs = fileInfo()->inlineContents (flags);
 
 	// Transform the objects
 for (LDObject * obj : objs)
@@ -330,7 +330,7 @@
 
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDObject::moveObjects (List<LDObject*> objs, const bool up)
+void LDObject::moveObjects (QList<LDObject*> objs, const bool up)
 {	if (objs.size() == 0)
 		return;
 
@@ -338,7 +338,7 @@
 	const long start = up ? 0 : (objs.size() - 1);
 	const long end = up ? objs.size() : -1;
 	const long incr = up ? 1 : -1;
-	List<LDObject*> objsToCompile;
+	QList<LDObject*> objsToCompile;
 	LDFile* file = objs[0]->file();
 
 	for (long i = start; i != end; i += incr)
@@ -380,7 +380,7 @@
 
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDObject::objectListContents (const List<LDObject*>& objs)
+str LDObject::objectListContents (const QList<LDObject*>& objs)
 {	bool firstDetails = true;
 	str text = "";