Merge from trunk

(bzr r9508.1.73)

1 files changed, 9 insertions, 9 deletions

diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index e97b6f4ec..538638d7a 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -42,7 +42,7 @@ get_nearest_common_ancestor(SPObject const *const obj, SPItem const *const objs[
 
 
 static bool try_get_intersect_point_with_item_recursive(Geom::PathVector& conn_pv, SPItem* item,
-        const Geom::Matrix& item_transform, double& intersect_pos) {
+        const Geom::Affine& item_transform, double& intersect_pos) {
 
     double initial_pos = intersect_pos;
     // if this is a group...
@@ -95,7 +95,7 @@ static bool try_get_intersect_point_with_item_recursive(Geom::PathVector& conn_p
 // The transforms given should be to a common ancestor of both the path and item.
 //
 static bool try_get_intersect_point_with_item(SPPath* conn, SPItem* item,
-        const Geom::Matrix& item_transform, const Geom::Matrix& conn_transform,
+        const Geom::Affine& item_transform, const Geom::Affine& conn_transform,
         const bool at_start, double& intersect_pos) {
 
     // Copy the curve and apply transformations up to common ancestor.
@@ -146,7 +146,7 @@ sp_conn_get_route_and_redraw(SPPath *const path,
 
     SPItem const *const path_item = SP_ITEM(path);
     SPObject const *const ancestor = get_nearest_common_ancestor(path_item, h2attItem);
-    Geom::Matrix const path2anc(i2anc_affine(path_item, ancestor));
+    Geom::Affine const path2anc(i2anc_affine(path_item, ancestor));
 
     // Set sensible values incase there the connector ends are not
     // attached to any shapes.
@@ -156,7 +156,7 @@ sp_conn_get_route_and_redraw(SPPath *const path,
     SPConnEnd** _connEnd = path->connEndPair.getConnEnds();
     for (unsigned h = 0; h < 2; ++h) {
         if (h2attItem[h] && _connEnd[h]->type == ConnPointDefault && _connEnd[h]->id == ConnPointPosCC) {
-            Geom::Matrix h2i2anc = i2anc_affine(h2attItem[h], ancestor);
+            Geom::Affine h2i2anc = i2anc_affine(h2attItem[h], ancestor);
             try_get_intersect_point_with_item(path, h2attItem[h], h2i2anc, path2anc,
                         (h == 0), endPos[h]);
         }
@@ -170,7 +170,7 @@ sp_conn_get_route_and_redraw(SPPath *const path,
 
 
 static void
-sp_conn_end_shape_move(Geom::Matrix const */*mp*/, SPItem */*moved_item*/,
+sp_conn_end_shape_move(Geom::Affine const */*mp*/, SPItem */*moved_item*/,
                             SPPath *const path)
 {
     if (path->connEndPair.isAutoRoutingConn()) {
@@ -232,8 +232,8 @@ sp_conn_end_deleted(SPObject *, SPObject *const owner, unsigned const handle_ix)
     g_return_if_fail(handle_ix < 2);
     char const * const attr_strs[] = {"inkscape:connection-start", "inkscape:connection-start-point",
                                       "inkscape:connection-end", "inkscape:connection-end-point"};
-    SP_OBJECT_REPR(owner)->setAttribute(attr_strs[2*handle_ix], NULL);
-    SP_OBJECT_REPR(owner)->setAttribute(attr_strs[2*handle_ix+1], NULL);
+    owner->getRepr()->setAttribute(attr_strs[2*handle_ix], NULL);
+    owner->getRepr()->setAttribute(attr_strs[2*handle_ix+1], NULL);
     /* I believe this will trigger sp_conn_end_href_changed. */
 }
 
@@ -374,8 +374,8 @@ sp_conn_end_href_changed(SPObject */*old_ref*/, SPObject */*ref*/,
         SPObject *refobj = connEnd.ref.getObject();
         if (refobj) {
             connEnd._delete_connection
-                = SP_OBJECT(refobj)->connectDelete(sigc::bind(sigc::ptr_fun(&sp_conn_end_deleted),
-                                                              SP_OBJECT(path), handle_ix));
+                = refobj->connectDelete(sigc::bind(sigc::ptr_fun(&sp_conn_end_deleted),
+                                                   path, handle_ix));
             connEnd._transformed_connection
                 = SP_ITEM(refobj)->connectTransformed(sigc::bind(sigc::ptr_fun(&sp_conn_end_shape_move),
                                                                  path));