Remove unused parameter in SPItem::doWriteTransform

34 files changed, 74 insertions, 75 deletions

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 807c8f7e1..b13af6bac 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1666,7 +1666,7 @@ void ObjectSet::applyAffine(Geom::Affine const &affine, bool set_i2d, bool compe
                     for (auto& itm: region.children) {
                         SPUse *use = dynamic_cast<SPUse *>(&itm);
                         if ( use ) {
-                            use->doWriteTransform(use->getRepr(), item->transform.inverse(), NULL, compensate);
+                            use->doWriteTransform(item->transform.inverse(), NULL, compensate);
                         }
                     }
                 }
@@ -1710,13 +1710,13 @@ void ObjectSet::applyAffine(Geom::Affine const &affine, bool set_i2d, bool compe
 
                 if (prefs_parallel) {
                     Geom::Affine move = result * clone_move * t_inv;
-                    item->doWriteTransform(item->getRepr(), move, &move, compensate);
+                    item->doWriteTransform(move, &move, compensate);
 
                 } else if (prefs_unmoved) {
                     //if (dynamic_cast<SPUse *>(sp_use_get_original(dynamic_cast<SPUse *>(item))))
                     //    clone_move = Geom::identity();
                     Geom::Affine move = result * clone_move;
-                    item->doWriteTransform(item->getRepr(), move, &t, compensate);
+                    item->doWriteTransform(move, &t, compensate);
                 }
 
             } else if (transform_offset_with_source && (prefs_parallel || prefs_unmoved) && affine.isTranslation()){
@@ -1725,23 +1725,23 @@ void ObjectSet::applyAffine(Geom::Affine const &affine, bool set_i2d, bool compe
 
                 if (prefs_parallel) {
                     Geom::Affine move = result * offset_move * t_inv;
-                    item->doWriteTransform(item->getRepr(), move, &move, compensate);
+                    item->doWriteTransform(move, &move, compensate);
 
                 } else if (prefs_unmoved) {
                     Geom::Affine move = result * offset_move;
-                    item->doWriteTransform(item->getRepr(), move, &t, compensate);
+                    item->doWriteTransform(move, &t, compensate);
                 }
 
             } else {
                 // just apply the result
-                item->doWriteTransform(item->getRepr(), result, &t, compensate);
+                item->doWriteTransform(result, &t, compensate);
             }
 
         } else {
             if (set_i2d) {
                 item->set_i2d_affine(item->i2dt_affine() * (Geom::Affine)affine);
             }
-            item->doWriteTransform(item->getRepr(), item->transform, NULL, compensate);
+            item->doWriteTransform(item->transform, NULL, compensate);
         }
 
         if (adjust_transf_center) { // The transformation center should not be touched in case of pasting or importing, which is allowed by this if clause
@@ -3171,7 +3171,7 @@ void ObjectSet::toSymbol()
                 prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
 
                 // Remove transform on group, updating clones.
-                the_group->doWriteTransform(object->getRepr(), Geom::identity());
+                the_group->doWriteTransform(Geom::identity());
 
                 // restore compensation setting
                 prefs->setInt("/options/clonecompensation/value", saved_compensation);
@@ -3483,7 +3483,7 @@ void ObjectSet::untile()
 
                 if (i) {
                     Geom::Affine transform( i->transform * pat_transform );
-                    i->doWriteTransform(i->getRepr(), transform);
+                    i->doWriteTransform(transform);
 
                     new_select.push_back(i);
                 } else {
@@ -3955,9 +3955,9 @@ void ObjectSet::setClipGroup()
 
             Geom::Affine oldtr=(*i)->transform;
             oldtr *= SP_ITEM((*i)->parent)->i2doc_affine().inverse();
-            (*i)->doWriteTransform((*i)->getRepr(), (*i)->i2doc_affine());
+            (*i)->doWriteTransform((*i)->i2doc_affine());
             Inkscape::XML::Node *dup = (*i)->getRepr()->duplicate(xml_doc);
-            (*i)->doWriteTransform((*i)->getRepr(), oldtr);
+            (*i)->doWriteTransform(oldtr);
             mask_items.push_back(dup);
 
             if (remove_original) {
@@ -4160,7 +4160,7 @@ void ObjectSet::unsetMask(const bool apply_clip_path, const bool skip_undo) {
             // transform mask, so it is moved the same spot where mask was applied
             Geom::Affine transform(mask_item->transform);
             transform *= (*it).second->transform;
-            mask_item->doWriteTransform(mask_item->getRepr(), transform);
+            mask_item->doWriteTransform(transform);
         }
 
         g_slist_free(items_to_move);
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 9e18bbe90..68d946712 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -558,7 +558,7 @@ void Inkscape::SelTrans::stamp()
                 new_affine = &original_item->transform;
             }
 
-            copy_item->doWriteTransform(copy_repr, *new_affine);
+            copy_item->doWriteTransform(*new_affine);
 
             if ( copy_item->isCenterSet() && _center ) {
                 copy_item->setCenter(*_center * _current_relative_affine);
diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index 1829837d8..52c043aee 100644
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -310,7 +310,7 @@ const gchar *SPClipPath::create (std::vector<Inkscape::XML::Node*> &reprs, SPDoc
 
         if (NULL != applyTransform) {
             Geom::Affine transform (item->transform * (*applyTransform));
-            item->doWriteTransform(item->getRepr(), transform);
+            item->doWriteTransform(transform);
         }
     }
 
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 741ca7886..c5af85774 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -714,7 +714,7 @@ Geom::Affine SPFlowtext::set_transform (Geom::Affine const &xform)
         SPRect *rect = dynamic_cast<SPRect *>(region->firstChild());
         if (rect) {
             rect->set_i2d_affine(xform * rect->i2dt_affine());
-            rect->doWriteTransform(rect->getRepr(), rect->transform, NULL, true);
+            rect->doWriteTransform(rect->transform, NULL, true);
         }
     }
 
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 68c17abc8..4dbfa8ac3 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -643,7 +643,7 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d
         SPItem *item = static_cast<SPItem *>(doc->getObjectByRepr(repr));
 
         if (item) {
-            item->doWriteTransform(repr, item->transform, NULL, false);
+            item->doWriteTransform(item->transform, NULL, false);
             children.insert(children.begin(),item);
         } else {
             g_assert_not_reached();
@@ -785,7 +785,7 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo
                            tAff[4] = 0.0;
                            tAff[5] = 0.0;
                         }
-                        item->doWriteTransform(item->getRepr(), tAff, NULL, true);
+                        item->doWriteTransform(tAff, NULL, true);
                     } else {
                         // used for other import
                         SPItem *sub_item = NULL;
@@ -793,16 +793,16 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo
                             sub_item = dynamic_cast<SPItem *>(item->clip_ref->getObject()->firstChild());
                         }
                         if (sub_item != NULL) {
-                            sub_item->doWriteTransform(sub_item->getRepr(), sub_item->transform*sc, NULL, true);
+                            sub_item->doWriteTransform(sub_item->transform*sc, NULL, true);
                         }
                         sub_item = NULL;
                         if (item->mask_ref->getObject()) {
                             sub_item = dynamic_cast<SPItem *>(item->mask_ref->getObject()->firstChild());
                         }
                         if (sub_item != NULL) {
-                            sub_item->doWriteTransform(sub_item->getRepr(), sub_item->transform*sc, NULL, true);
+                            sub_item->doWriteTransform(sub_item->transform*sc, NULL, true);
                         }
-                        item->doWriteTransform(item->getRepr(), sc.inverse()*item->transform*sc, NULL, true);
+                        item->doWriteTransform(sc.inverse()*item->transform*sc, NULL, true);
                         group->scaleChildItemsRec(sc, p, false);
                     }
                 } else {
@@ -845,18 +845,18 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo
                             item->transform = Geom::Affine();
                             // Apply scale
                             item->set_i2d_affine(item->i2dt_affine() * sc);
-                            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+                            item->doWriteTransform(item->transform, NULL, true);
                             // Scale translation and restore original transform
                             tmp[4] *= sc[0];
                             tmp[5] *= sc[1];
-                            item->doWriteTransform(item->getRepr(), tmp, NULL, true);
+                            item->doWriteTransform(tmp, NULL, true);
                         } else if (dynamic_cast<SPUse *>(item)) {
                             // calculate the matrix we need to apply to the clone
                             // to cancel its induced transform from its original
                             Geom::Affine move = final.inverse() * item->transform * final;
-                            item->doWriteTransform(item->getRepr(), move, &move, true);
+                            item->doWriteTransform(move, &move, true);
                         } else {
-                            item->doWriteTransform(item->getRepr(), item->transform*sc, NULL, true);
+                            item->doWriteTransform(item->transform*sc, NULL, true);
                         }
                         
                         if (conn_type != NULL) {
diff --git a/src/sp-item-notify-moveto.cpp b/src/sp-item-notify-moveto.cpp
index dcc91fd0b..28648c03a 100644
--- a/src/sp-item-notify-moveto.cpp
+++ b/src/sp-item-notify-moveto.cpp
@@ -51,7 +51,7 @@ void sp_item_notify_moveto(SPItem &item, SPGuide const &mv_g, int const snappoin
 
         /* Commit repr. */
         {
-            item.doWriteTransform(item.getRepr(), item.transform);
+            item.doWriteTransform(item.transform);
         }
 
         sp_item_rm_unsatisfied_cns(item);
diff --git a/src/sp-item-transform.cpp b/src/sp-item-transform.cpp
index f1c69cdf6..3675323ca 100644
--- a/src/sp-item-transform.cpp
+++ b/src/sp-item-transform.cpp
@@ -29,7 +29,7 @@ void sp_item_rotate_rel(SPItem *item, Geom::Rotate const &rotation)
     // Rotate item.
     item->set_i2d_affine(item->i2dt_affine() * (Geom::Affine)affine);
     // Use each item's own transform writer, consistent with sp_selection_apply_affine()
-    item->doWriteTransform(item->getRepr(), item->transform);
+    item->doWriteTransform(item->transform);
 
     // Restore the center position (it's changed because the bbox center changed)
     if (item->isCenterSet()) {
@@ -44,7 +44,7 @@ void sp_item_scale_rel(SPItem *item, Geom::Scale const &scale)
     if (bbox) {
         Geom::Translate const s(bbox->midpoint()); // use getCenter?
         item->set_i2d_affine(item->i2dt_affine() * s.inverse() * scale * s);
-        item->doWriteTransform(item->getRepr(), item->transform);
+        item->doWriteTransform(item->transform);
     }
 }
 
@@ -57,7 +57,7 @@ void sp_item_skew_rel(SPItem *item, double skewX, double skewY)
     Geom::Affine affine = Geom::Affine(s).inverse() * skew * Geom::Affine(s);
 
     item->set_i2d_affine(item->i2dt_affine() * affine);
-    item->doWriteTransform(item->getRepr(), item->transform);
+    item->doWriteTransform(item->transform);
 
     // Restore the center position (it's changed because the bbox center changed)
     if (item->isCenterSet()) {
@@ -70,7 +70,7 @@ void sp_item_move_rel(SPItem *item, Geom::Translate const &tr)
 {
     item->set_i2d_affine(item->i2dt_affine() * tr);
 
-    item->doWriteTransform(item->getRepr(), item->transform);
+    item->doWriteTransform(item->transform);
 }
 
 /**
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index b4642da5d..dd98ee1a4 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -1422,9 +1422,8 @@ Geom::Affine SPItem::set_transform(Geom::Affine const &transform) {
 	return transform;
 }
 
-void SPItem::doWriteTransform(Inkscape::XML::Node *repr, Geom::Affine const &transform, Geom::Affine const *adv, bool compensate)
+void SPItem::doWriteTransform(Geom::Affine const &transform, Geom::Affine const *adv, bool compensate)
 {
-    g_return_if_fail(repr != NULL);
     // calculate the relative transform, if not given by the adv attribute
     Geom::Affine advertized_transform;
     if (adv != NULL) {
diff --git a/src/sp-item.h b/src/sp-item.h
index c4d353a1d..36af02edc 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -330,7 +330,7 @@ public:
      * stored optimized. Send _transformed_signal. Invoke _write method so that
      * the repr is updated with the new transform.
      */
-    void doWriteTransform(Inkscape::XML::Node *repr, Geom::Affine const &transform, Geom::Affine const *adv = NULL, bool compensate = true);
+    void doWriteTransform(Geom::Affine const &transform, Geom::Affine const *adv = NULL, bool compensate = true);
 
     /**
      * Sets item private transform (not propagated to repr), without compensating stroke widths,
diff --git a/src/sp-marker.cpp b/src/sp-marker.cpp
index 43df8525d..01a0d5e61 100644
--- a/src/sp-marker.cpp
+++ b/src/sp-marker.cpp
@@ -455,7 +455,7 @@ const gchar *generate_marker(std::vector<Inkscape::XML::Node*> &reprs, Geom::Rec
             dup_transform = Geom::identity();
         dup_transform *= move;
 
-        copy->doWriteTransform(copy->getRepr(), dup_transform);
+        copy->doWriteTransform(dup_transform);
     }
 
     Inkscape::GC::release(repr);
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index a47fab35e..d2d4801f9 100644
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -209,7 +209,7 @@ sp_mask_create (std::vector<Inkscape::XML::Node*> &reprs, SPDocument *document,
         
         if (NULL != applyTransform) {
             Geom::Affine transform (item->transform * (*applyTransform));
-            item->doWriteTransform(item->getRepr(), transform);
+            item->doWriteTransform(transform);
         }
     }
 
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index e5b1b5d69..e2ec9751c 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -1065,7 +1065,7 @@ static void sp_offset_move_compensate(Geom::Affine const *mp, SPItem */*original
 
     // commit the compensation
     self->transform *= offset_move;
-    self->doWriteTransform(self->getRepr(), self->transform, &advertized_move);
+    self->doWriteTransform(self->transform, &advertized_move);
     self->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 1e198506b..9ecfe8baa 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -408,7 +408,7 @@ const gchar *SPPattern::produce(const std::vector<Inkscape::XML::Node *> &reprs,
             dup_transform = Geom::identity();
         dup_transform *= move;
 
-        copy->doWriteTransform(copy->getRepr(), dup_transform, NULL, false);
+        copy->doWriteTransform(dup_transform, NULL, false);
     }
 
     Inkscape::GC::release(repr);
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 648852961..abb59d299 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -442,7 +442,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
             	if(item){
                     item->transform *= m;
                     Geom::Affine identity;
-                    item->doWriteTransform(clip.getRepr(),item->transform, &identity);
+                    item->doWriteTransform(item->transform, &identity);
             	}
             }
         }
@@ -452,7 +452,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
             	if(item){
                     item->transform *= m;
                     Geom::Affine identity;
-                    item->doWriteTransform(mask.getRepr(),item->transform, &identity);
+                    item->doWriteTransform(item->transform, &identity);
             	}
             }
         }
@@ -482,7 +482,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
         	if(item){
                 item->transform *= clone_move.inverse();
                 Geom::Affine identity;
-                item->doWriteTransform(clip.getRepr(),item->transform, &identity);
+                item->doWriteTransform(item->transform, &identity);
         	}
         }
     }
@@ -492,7 +492,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
         	if(item){
                 item->transform *= clone_move.inverse();
                 Geom::Affine identity;
-                item->doWriteTransform(mask.getRepr(),item->transform, &identity);
+                item->doWriteTransform(item->transform, &identity);
         	}
         }
     }
@@ -500,7 +500,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
 
     // commit the compensation
     this->transform *= clone_move;
-    this->doWriteTransform(this->getRepr(), this->transform, &advertized_move);
+    this->doWriteTransform(this->transform, &advertized_move);
     this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
@@ -742,7 +742,7 @@ SPItem *SPUse::unlink() {
     {
         Geom::Affine nomove(Geom::identity());
         // Advertise ourselves as not moving.
-        item->doWriteTransform(item->getRepr(), t, &nomove);
+        item->doWriteTransform(t, &nomove);
     }
 
     return item;
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index c594a6426..3410a2635 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -867,7 +867,7 @@ void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Affine
         //There is a special group to markers whith this reverse the order in clussion
         m_repr->setPosition(0);
         SPItem *marker_item = (SPItem *) doc->getObjectByRepr(m_repr);
-        marker_item->doWriteTransform(m_repr, tr);
+        marker_item->doWriteTransform(tr);
         if (!legacy) {
             sp_item_path_outline(marker_item, desktop, legacy);
         }
@@ -1414,7 +1414,7 @@ sp_item_path_outline(SPItem *item, SPDesktop *desktop, bool legacy)
                 // restore title, description, id, transform
                 g_repr->setAttribute("id", id);
                 SPItem *newitem = (SPItem *) doc->getObjectByRepr(g_repr);
-                newitem->doWriteTransform(g_repr, transform);
+                newitem->doWriteTransform(transform);
                 if (title) {
                 	newitem->setTitle(title);
                 }
@@ -1768,7 +1768,7 @@ void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool
 
     Geom::Affine const transform(item->transform);
 
-    item->doWriteTransform(item->getRepr(), Geom::identity());
+    item->doWriteTransform(Geom::identity());
 
     //XML Tree being used directly here while it shouldn't be...
     gchar *style = g_strdup(item->getRepr()->attribute("style"));
@@ -1869,7 +1869,7 @@ void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool
         if ( updating ) {
 
 			//XML Tree being used directly here while it shouldn't be
-            item->doWriteTransform(item->getRepr(), transform);
+            item->doWriteTransform(transform);
             char const *id = item->getRepr()->attribute("id");
             char const *uri = g_strdup_printf("#%s", id);
             repr->setAttribute("xlink:href", uri);
@@ -1893,7 +1893,7 @@ void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool
             const char *n_id = item->getRepr()->attribute("id");
             item->deleteObject(false);
             repr->setAttribute("id", n_id);
-            nitem->doWriteTransform(repr, transform);
+            nitem->doWriteTransform(transform);
         }
 
         // The object just created from a temporary repr is only a seed.
@@ -1961,7 +1961,7 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
 
         Geom::Affine const transform(item->transform);
 
-        item->doWriteTransform(item->getRepr(), Geom::identity());
+        item->doWriteTransform(Geom::identity());
 
         gchar *style = g_strdup(item->getRepr()->attribute("style"));
 
@@ -2103,7 +2103,7 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
             SPItem *newitem = (SPItem *) desktop->getDocument()->getObjectByRepr(repr);
 
             // reapply the transform
-            newitem->doWriteTransform(repr, transform);
+            newitem->doWriteTransform(transform);
 
             repr->setAttribute("id", id);
 
@@ -2173,7 +2173,7 @@ sp_selected_path_simplify_item(SPDesktop *desktop,
        this is necessary so that the item is transformed twice back and forth,
        allowing all compensations to cancel out regardless of the preferences
     */
-    item->doWriteTransform(item->getRepr(), Geom::identity());
+    item->doWriteTransform(Geom::identity());
 
     gchar *style = g_strdup(item->getRepr()->attribute("style"));
     gchar *mask = g_strdup(item->getRepr()->attribute("mask"));
@@ -2246,7 +2246,7 @@ sp_selected_path_simplify_item(SPDesktop *desktop,
     SPItem *newitem = (SPItem *) desktop->getDocument()->getObjectByRepr(repr);
 
     // reapply the transform
-    newitem->doWriteTransform(repr, transform);
+    newitem->doWriteTransform(transform);
 
     // restore title & description
     if (title) {
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index 2b731c75d..bde269de7 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -119,7 +119,7 @@ text_put_on_path()
         parent->appendChild(repr);
 
         SPItem *new_item = (SPItem *) desktop->getDocument()->getObjectByRepr(repr);
-        new_item->doWriteTransform(repr, text->transform);
+        new_item->doWriteTransform(text->transform);
         new_item->updateRepr();
 
         Inkscape::GC::release(repr);
@@ -505,7 +505,7 @@ flowtext_to_text()
         parent->addChild(repr, item->getRepr());
 
         SPItem *new_item = reinterpret_cast<SPItem *>(desktop->getDocument()->getObjectByRepr(repr));
-        new_item->doWriteTransform(repr, item->transform);
+        new_item->doWriteTransform(item->transform);
         new_item->updateRepr();
     
         Inkscape::GC::release(repr);
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 52e99886a..b93d8358f 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -527,7 +527,7 @@ void Tracer::traceThread()
         if (reprobj)
             {
             SPItem *newItem = SP_ITEM(reprobj);
-            newItem->doWriteTransform(pathRepr, tf, NULL);
+            newItem->doWriteTransform(tf);
             }
         if (nrPaths == 1)
             {
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 3cbc1b6e9..6e08645cf 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -329,7 +329,7 @@ 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);
+                 item->doWriteTransform(item->transform);
                  SP_OBJECT (current_row->data)->updateRepr();
                  cnt +=1;
              }
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 3c99d1461..4a381a565 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -713,12 +713,12 @@ void LayersPanel::_doTreeMove( )
 {
     if (_dnd_source &&  _dnd_source->getRepr() ) {
         if(!_dnd_target){
-            _dnd_source->doWriteTransform(_dnd_source->getRepr(), _dnd_source->i2doc_affine() * _dnd_source->document->getRoot()->i2doc_affine().inverse());
+            _dnd_source->doWriteTransform(_dnd_source->i2doc_affine() * _dnd_source->document->getRoot()->i2doc_affine().inverse());
         }else{
             SPItem* parent = _dnd_into ? _dnd_target : dynamic_cast<SPItem*>(_dnd_target->parent);
             if(parent){
                 Geom::Affine move = _dnd_source->i2doc_affine() * parent->i2doc_affine().inverse();
-                _dnd_source->doWriteTransform(_dnd_source->getRepr(), move);
+                _dnd_source->doWriteTransform(move);
             }
         }
         _dnd_source->moveTo(_dnd_target, _dnd_into);
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index 2b4550d20..75e1a56b8 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -140,7 +140,7 @@ static void rotateAround(SPItem *item, Geom::Point center, Geom::Rotate const &r
     center = item->getCenter();
 
 	item->set_i2d_affine(item->i2dt_affine() * affine);
-	item->doWriteTransform(item->getRepr(), item->transform);
+	item->doWriteTransform(item->transform);
 
 	if(item->isCenterSet())
 	{
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 5ad1b9ec5..8713e6ddc 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -727,7 +727,7 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
 
                 Geom::Affine scaler = get_scale_transform_for_variable_stroke (*bbox_pref, *bbox_geom, transform_stroke, preserve, x0, y0, x1, y1);
                 item->set_i2d_affine(item->i2dt_affine() * scaler);
-                item->doWriteTransform(item->getRepr(), item->transform);
+                item->doWriteTransform(item->transform);
             }
         }
     } else {
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index b501962fb..712561b85 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -418,7 +418,7 @@ void ArcTool::finishItem() {
         }
 
         this->arc->updateRepr();
-        this->arc->doWriteTransform(this->arc->getRepr(), this->arc->transform, NULL, true);
+        this->arc->doWriteTransform(this->arc->transform, NULL, true);
 
         desktop->canvas->endForcedFullRedraws();
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 266375caa..3e00fe69c 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -947,7 +947,7 @@ void CalligraphicTool::set_to_accumulated(bool unionize, bool subtract) {
             result = desktop->getSelection()->singleItem();
         }
 
-        result->doWriteTransform(result->getRepr(), result->transform, NULL, true);
+        result->doWriteTransform(result->transform, NULL, true);
     } else {
         if (this->repr) {
             sp_repr_unparent(this->repr);
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 6d2682089..59d670d74 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -904,7 +904,7 @@ void ConnectorTool::_flushWhite(SPCurve *gc) {
             this->newconn->updateRepr();
         }
 
-        this->newconn->doWriteTransform(this->newconn->getRepr(), this->newconn->transform, NULL, true);
+        this->newconn->doWriteTransform(this->newconn->transform, NULL, true);
 
         // Only set the selection after we are finished with creating the attributes of
         // the connector.  Otherwise, the selection change may alter the defaults for
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index b4246b9cc..b919c138c 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -780,7 +780,7 @@ void EraserTool::set_to_accumulated() {
                                         if (dup_clip) {
                                             SPItem * dup_clip_obj = SP_ITEM(item_repr->parent->appendChildRepr(dup_clip));
                                             if (dup_clip_obj) {
-                                                dup_clip_obj->doWriteTransform(dup_clip, item->transform);
+                                                dup_clip_obj->doWriteTransform(item->transform);
                                                 sp_object_ref(clip_path, 0);
                                                 clip_path->deleteObject(true);
                                                 sp_object_unref(clip_path);
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index f6f9b4355..daeff228c 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -444,7 +444,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
 
         SPObject *reprobj = document->getObjectByRepr(pathRepr);
         if (reprobj) {
-            SP_ITEM(reprobj)->doWriteTransform(pathRepr, transform, NULL);
+            SP_ITEM(reprobj)->doWriteTransform(transform);
             
             // premultiply the item transform by the accumulated parent transform in the paste layer
             Geom::Affine local (SP_GROUP(desktop->currentLayer())->i2doc_affine());
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 4313c4e29..fce17542a 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -822,7 +822,7 @@ static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
             Inkscape::GC::release(repr);
             item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
             item->updateRepr();
-            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+            item->doWriteTransform(item->transform, NULL, true);
             spdc_check_for_and_apply_waiting_LPE(dc, item, c, false);
             dc->selection->set(repr);
             if(previous_shape_type == BEND_CLIPBOARD){
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 0da883891..24295e7cf 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1005,7 +1005,7 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
         text_item_box->transform *= Geom::Translate(pos);
         text_item_box->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
         text_item_box->updateRepr();
-        text_item_box->doWriteTransform(text_item_box->getRepr(), text_item_box->transform, NULL, true);
+        text_item_box->doWriteTransform(text_item_box->transform, NULL, true);
         Inkscape::XML::Node *rlabel = text_item_box->getRepr();
         text_item_box->deleteObject();
         measure_repr->addChild(rlabel, NULL);
@@ -1014,7 +1014,7 @@ void MeasureTool::setLabelText(const char *value, Geom::Point pos, double fontsi
         text_item->transform *= Geom::Rotate(angle);
         text_item->transform *= Geom::Translate(pos);
         text_item->transform *= SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-        text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
+        text_item->doWriteTransform(text_item->transform, NULL, true);
     }
 }
 
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 9ebf51e76..0a116e8cd 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -447,7 +447,7 @@ void RectTool::finishItem() {
         }
 
         this->rect->updateRepr();
-        this->rect->doWriteTransform(this->rect->getRepr(), this->rect->transform, NULL, true);
+        this->rect->doWriteTransform(this->rect->transform, NULL, true);
 
         this->desktop->canvas->endForcedFullRedraws();
 
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index b681aec38..8e10935e8 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -390,7 +390,7 @@ void SpiralTool::finishItem() {
 
         spiral->set_shape();
         spiral->updateRepr(SP_OBJECT_WRITE_EXT);
-        spiral->doWriteTransform(spiral->getRepr(), spiral->transform, NULL, true);
+        spiral->doWriteTransform(spiral->transform, NULL, true);
 
         this->desktop->canvas->endForcedFullRedraws();
 
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f3e7e6d3c..eec7babc4 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -120,7 +120,7 @@ static void sp_spray_rotate_rel(Geom::Point c, SPDesktop */*desktop*/, SPItem *i
     // Rotate item.
     item->set_i2d_affine(item->i2dt_affine() * affine);
     // Use each item's own transform writer, consistent with sp_selection_apply_affine()
-    item->doWriteTransform(item->getRepr(), item->transform);
+    item->doWriteTransform(item->transform);
     // Restore the center position (it's changed because the bbox center changed)
     if (item->isCenterSet()) {
         item->setCenter(c);
@@ -133,7 +133,7 @@ static void sp_spray_scale_rel(Geom::Point c, SPDesktop */*desktop*/, SPItem *it
 {
     Geom::Translate const s(c);
     item->set_i2d_affine(item->i2dt_affine() * s.inverse() * scale * s);
-    item->doWriteTransform(item->getRepr(), item->transform);
+    item->doWriteTransform(item->transform);
 }
 
 SprayTool::SprayTool()
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 32f0e6d92..d5e782f68 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -415,7 +415,7 @@ void StarTool::finishItem() {
         this->star->setCenter(this->center);
         this->star->set_shape();
         this->star->updateRepr(SP_OBJECT_WRITE_EXT);
-        this->star->doWriteTransform(this->star->getRepr(), this->star->transform, NULL, true);
+        this->star->doWriteTransform(this->star->transform, NULL, true);
 
         desktop->canvas->endForcedFullRedraws();
 
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 9091b455e..bab4ebb59 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -417,7 +417,7 @@ static void sp_text_context_setup_text(TextTool *tc)
     text_item->transform = SP_ITEM(ec->desktop->currentLayer())->i2doc_affine().inverse();
 
     text_item->updateRepr();
-    text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
+    text_item->doWriteTransform(text_item->transform, NULL, true);
     DocumentUndo::done(ec->desktop->getDocument(), SP_VERB_CONTEXT_TEXT,
                _("Create text"));
 }
diff --git a/src/unclump.cpp b/src/unclump.cpp
index 5ec5cfce4..55825cdd6 100644
--- a/src/unclump.cpp
+++ b/src/unclump.cpp
@@ -298,7 +298,7 @@ unclump_push (SPItem *from, SPItem *what, double dist)
     //g_print ("push %s at %g,%g from %g,%g by %g,%g, dist %g\n", what->getId(), it[Geom::X],it[Geom::Y], p[Geom::X],p[Geom::Y], by[Geom::X],by[Geom::Y], dist);
 
     what->set_i2d_affine(what->i2dt_affine() * move);
-    what->doWriteTransform(what->getRepr(), what->transform, NULL);
+    what->doWriteTransform(what->transform);
 }
 
 /**
@@ -321,7 +321,7 @@ unclump_pull (SPItem *to, SPItem *what, double dist)
     //g_print ("pull %s at %g,%g to %g,%g by %g,%g, dist %g\n", what->getId(), it[Geom::X],it[Geom::Y], p[Geom::X],p[Geom::Y], by[Geom::X],by[Geom::Y], dist);
 
     what->set_i2d_affine(what->i2dt_affine() * move);
-    what->doWriteTransform(what->getRepr(), what->transform, NULL);
+    what->doWriteTransform(what->transform);
 }