X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-item.h;h=d95fc2486f1b28ce9cce49c54e3fab5e66ef6e1c;hb=b8a8935e3c014b579eaaf477faefa52fd8c88faa;hp=1cc05eb25aab3e0114bdc9119198899021056528;hpb=6c3e745a94ef6b25a4ef9f018d350a7535aa45af;p=inkscape.git

diff --git a/src/sp-item.h b/src/sp-item.h
index 1cc05eb25..d95fc2486 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -21,7 +21,7 @@
 
 #include "display/nr-arena-forward.h"
 #include "sp-object.h"
-#include <libnr/nr-matrix.h>
+#include <2geom/matrix.h>
 #include <libnr/nr-rect.h>
 #include <2geom/forward.h>
 #include <libnr/nr-convert2geom.h>
@@ -57,8 +57,6 @@ struct SPEvent {
     gpointer data;
 };
 
-class SPItemView;
-
 /// SPItemView
 struct SPItemView {
     SPItemView *next;
@@ -79,8 +77,6 @@ struct SPItemView {
  */
 #define SP_ITEM_REFERENCE_FLAGS (1 << 1)
 
-class SPItemCtx;
-
 /// Contains transformations to document/viewport and the viewport size.
 struct SPItemCtx {
     SPCtx ctx;
@@ -238,7 +234,6 @@ void sp_item_adjust_stroke_width_recursive(SPItem *item, gdouble ex);
 void sp_item_adjust_paint_recursive(SPItem *item, Geom::Matrix advertized_transform, Geom::Matrix t_ancestors, bool is_pattern);
 void sp_item_adjust_livepatheffect(SPItem *item, Geom::Matrix const &postmul, bool set = false);
 
-void sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, Geom::Matrix const *transform, Geom::Matrix const *adv = NULL);
 void sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, Geom::Matrix const &transform, Geom::Matrix const *adv = NULL, bool compensate = true);
 
 void sp_item_set_item_transform(SPItem *item, Geom::Matrix const &transform);
@@ -258,10 +253,6 @@ Geom::Matrix i2anc_affine(SPObject const *item, SPObject const *ancestor);
 Geom::Matrix i2i_affine(SPObject const *src, SPObject const *dest);
 
 Geom::Matrix sp_item_i2doc_affine(SPItem const *item);
-Geom::Matrix sp_item_i2root_affine(SPItem const *item);
-
-Geom::Matrix matrix_to_desktop (Geom::Matrix m, SPItem const *item);
-Geom::Matrix matrix_from_desktop (Geom::Matrix m, SPItem const *item);
 
 /* fixme: - these are evil, but OK */
 
@@ -272,7 +263,6 @@ Geom::Matrix matrix_from_desktop (Geom::Matrix m, SPItem const *item);
  * \return TRANSFORM.
  */
 Geom::Matrix sp_item_i2d_affine(SPItem const *item);
-Geom::Matrix sp_item_i2r_affine(SPItem const *item);
 void sp_item_set_i2d_affine(SPItem *item, Geom::Matrix const &transform);
 Geom::Matrix sp_item_dt2i_affine(SPItem const *item);
 int sp_item_repr_compare_position(SPItem *first, SPItem *second);