diff -r 6e80f038e8df -r c4b96bc41298 src/ldtypes.cpp --- a/src/ldtypes.cpp Fri May 24 04:34:20 2013 +0300 +++ b/src/ldtypes.cpp Fri May 24 15:23:56 2013 +0300 @@ -216,7 +216,7 @@ // Remove this object from the selection array if it is there. for (ulong i = 0; i < g_win->sel ().size(); ++i) if (g_win->sel ()[i] == this) - g_win->sel ().erase (g_win->sel ().begin() + i); + g_win->sel ().erase (i); // Delete the GL lists GL::deleteLists (this); @@ -339,7 +339,7 @@ // ============================================================================= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= -void LDObject::moveObjects (std::vector objs, const bool bUp) { +void LDObject::moveObjects (vector objs, const bool bUp) { // If we move down, we need to iterate the array in reverse order. const long start = bUp ? 0 : (objs.size() - 1); const long end = bUp ? objs.size() : -1; @@ -378,7 +378,7 @@ // ============================================================================= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= -str LDObject::objectListContents (const std::vector& objs) { +str LDObject::objectListContents (const vector& objs) { bool firstDetails = true; str text = ""; @@ -512,8 +512,8 @@ // ============================================================================= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= -std::vector LDRadial::decompose (bool applyTransform) { - std::vector paObjects; +vector LDRadial::decompose (bool applyTransform) { + vector paObjects; for (short i = 0; i < segs; ++i) { double x0 = cos ((i * 2 * pi) / divs),