Merging from trunk

[inkscape.git] / src / conn-avoid-ref.h

diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index cd6b60542f7004bfa16123ce3237308f867dd0fc..d34d8ca2e644be593e20589368326718dd51598a 100644 (file)
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -52,7 +52,7 @@ private:
 
 extern GSList *get_avoided_items(GSList *list, SPObject *from,
         SPDesktop *desktop, bool initialised = true);
-extern void avoid_item_move(NR::Matrix const *mp, SPItem *moved_item);
+extern void avoid_item_move(Geom::Matrix const *mp, SPItem *moved_item);
 extern void init_avoided_shape_geometry(SPDesktop *desktop);
 
 static const double defaultConnSpacing = 3.0;