Merge from trunk

(bzr r14059.2.11)

1 files changed, 6 insertions, 7 deletions

diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp
index ba5740e55..9ea75de0d 100644
--- a/src/removeoverlap.cpp
+++ b/src/removeoverlap.cpp
@@ -38,20 +38,19 @@ namespace {
 * such that rectangular bounding boxes are separated by at least xGap
 * horizontally and yGap vertically
 */
-void removeoverlap(GSList const *const items, double const xGap, double const yGap) {
-	using Inkscape::Util::GSListConstIterator;
-	std::list<SPItem *> selected;
-	selected.insert<GSListConstIterator<SPItem *> >(selected.end(), items, NULL);
+void removeoverlap(std::vector<SPItem*> const &items, double const xGap, double const yGap) {
+	std::vector<SPItem*> selected(items);
 	std::vector<Record> records;
 	std::vector<Rectangle *> rs;
 
 	Geom::Point const gap(xGap, yGap);
-	for (std::list<SPItem *>::iterator it(selected.begin());
+	for (std::vector<SPItem*>::iterator it(selected.begin());
 		it != selected.end();
 		++it)
 	{
+    	SPItem* item = *it;
 		using Geom::X; using Geom::Y;
-		Geom::OptRect item_box((*it)->desktopVisualBounds());
+		Geom::OptRect item_box((item)->desktopVisualBounds());
 		if (item_box) {
 			Geom::Point min(item_box->min() - .5*gap);
 			Geom::Point max(item_box->max() + .5*gap);
@@ -67,7 +66,7 @@ void removeoverlap(GSList const *const items, double const xGap, double const yG
 				min[Y] = max[Y] = (min[Y] + max[Y])/2;
 			}
 			Rectangle *vspc_rect = new Rectangle(min[X], max[X], min[Y], max[Y]);
-			records.push_back(Record(*it, item_box->midpoint(), vspc_rect));
+			records.push_back(Record(item, item_box->midpoint(), vspc_rect));
 			rs.push_back(vspc_rect);
 		}
 	}