Merge branch 'master' into powerpencil

1 files changed, 5 insertions, 7 deletions

diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 3cbc1b6e9..c16e60c5f 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -298,15 +298,14 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
     std::vector<SPItem*>::iterator it = sorted.begin();
     for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); ++row_cnt) {
 
-             GSList *current_row = NULL;
+             std::vector<SPItem *> current_row;
              col_cnt = 0;
              for(;it!=sorted.end()&&col_cnt<NoOfCols;++it) {
-                 current_row = g_slist_append (current_row, *it);
+                 current_row.push_back(*it);
                  col_cnt++;
              }
 
-             for (; current_row != NULL; current_row = current_row->next) {
-                 SPItem *item=SP_ITEM(current_row->data);
+             for (auto item:current_row) {
                  Inkscape::XML::Node *repr = item->getRepr();
                  Geom::OptRect b = item->documentVisualBounds();
                  Geom::Point min;
@@ -329,11 +328,10 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
                  Geom::Point move = Geom::Point(new_x - min[Geom::X], min[Geom::Y] - new_y);
                  Geom::Affine const affine = Geom::Affine(Geom::Translate(move));
                  item->set_i2d_affine(item->i2dt_affine() * affine);
-                 item->doWriteTransform(repr, item->transform,  NULL);
-                 SP_OBJECT (current_row->data)->updateRepr();
+                 item->doWriteTransform(item->transform);
+                 item->updateRepr();
                  cnt +=1;
              }
-             g_slist_free (current_row);
     }
 
     DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_ARRANGE,