diff -r 4e686b771996 -r ac2d3e8dd110 src/ldtypes.cpp --- a/src/ldtypes.cpp Thu May 09 17:03:44 2013 +0300 +++ b/src/ldtypes.cpp Fri May 10 17:39:56 2013 +0300 @@ -86,7 +86,7 @@ str val = fmt ("2 %d", color); for (ushort i = 0; i < 2; ++i) - val.appendformat (" %s", coords[i].stringRep (false).chars ()); + val += fmt (" %s", coords[i].stringRep (false).chars ()); return val; } @@ -95,7 +95,7 @@ str val = fmt ("3 %d", color); for (ushort i = 0; i < 3; ++i) - val.appendformat (" %s", coords[i].stringRep (false).chars ()); + val += fmt (" %s", coords[i].stringRep (false).chars ()); return val; } @@ -104,7 +104,7 @@ str val = fmt ("4 %d", color); for (ushort i = 0; i < 4; ++i) - val.appendformat (" %s", coords[i].stringRep (false).chars ()); + val += fmt (" %s", coords[i].stringRep (false).chars ()); return val; } @@ -114,7 +114,7 @@ // Add the coordinates for (ushort i = 0; i < 4; ++i) - val.appendformat (" %s", coords[i].stringRep (false).chars ()); + val += fmt (" %s", coords[i].stringRep (false).chars ()); return val; } @@ -386,7 +386,7 @@ if (objType == LDObject::Vertex && objCount != 1) noun = "vertices"; - text.appendformat ("%lu %s", objCount, noun.chars ()); + text += fmt ("%lu %s", objCount, noun.chars ()); firstDetails = false; } @@ -606,12 +606,12 @@ // ============================================================================= str LDRadial::getContents () { return fmt ("0 !LDFORGE RADIAL %s %d %d %d %d %s %s", - str (radialTypeName()).toupper ().strip (' ').chars (), + str (radialTypeName()).upper ().strip (' ').c (), color, segs, divs, ringNum, pos.stringRep (false).chars(), transform.stringRep().chars()); } -char const* g_saRadialNameRoots[] = { +char const* g_radialNameRoots[] = { "edge", "cyli", "disc", @@ -641,7 +641,7 @@ // Compose some general information: prefix, fraction, root, ring number str prefix = (divs == 16) ? "" : fmt ("%d/", divs); str frac = fmt ("%d-%d", numer, denom); - str root = g_saRadialNameRoots[radType]; + str root = g_radialNameRoots[radType]; str num = (radType == Ring || radType == Cone) ? fmt ("%d", ringNum) : ""; // Truncate the root if necessary (7-16rin4.dat for instance).