diff -r bebe09014dd6 -r 6a1fa662bfc1 src/ldtypes.cpp --- 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 g_LDObjects; +QList g_LDObjects; // ============================================================================= // LDObject constructors @@ -192,7 +192,7 @@ // ============================================================================= // ----------------------------------------------------------------------------- -List LDQuad::splitToTriangles() +QList 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 triangles; + QList triangles; triangles << tri1; triangles << tri2; return triangles; @@ -300,8 +300,8 @@ // ============================================================================= // ----------------------------------------------------------------------------- -List LDSubfile::inlineContents (InlineFlags flags) -{ List objs = fileInfo()->inlineContents (flags); +QList LDSubfile::inlineContents (InlineFlags flags) +{ QList objs = fileInfo()->inlineContents (flags); // Transform the objects for (LDObject * obj : objs) @@ -330,7 +330,7 @@ // ============================================================================= // ----------------------------------------------------------------------------- -void LDObject::moveObjects (List objs, const bool up) +void LDObject::moveObjects (QList 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 objsToCompile; + QList objsToCompile; LDFile* file = objs[0]->file(); for (long i = start; i != end; i += incr) @@ -380,7 +380,7 @@ // ============================================================================= // ----------------------------------------------------------------------------- -str LDObject::objectListContents (const List& objs) +str LDObject::objectListContents (const QList& objs) { bool firstDetails = true; str text = "";