get rid of a lot of no longer needed "libnr/nr-..." includes.

(bzr r7045)

19 files changed, 13 insertions, 58 deletions

diff --git a/src/box3d.cpp b/src/box3d.cpp
index a6dd378f1..34ce7a27f 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -19,7 +19,6 @@
 #include "attributes.h"
 #include "xml/document.h"
 #include "xml/repr.h"
-#include "libnr/nr-matrix-fns.h"
 
 #include "box3d.h"
 #include "box3d-side.h"
diff --git a/src/desktop-affine.cpp b/src/desktop-affine.cpp
index 95640c957..707b1df8a 100644
--- a/src/desktop-affine.cpp
+++ b/src/desktop-affine.cpp
@@ -15,7 +15,6 @@
 #include "desktop.h"
 //#include "document.h"
 //#include "sp-root.h"
-//#include "libnr/nr-matrix-ops.h"
 
 Geom::Matrix const sp_desktop_dt2doc_affine (SPDesktop const *dt)
 {
@@ -30,23 +29,23 @@ Geom::Point sp_desktop_dt2doc_xy_point(SPDesktop const *dt, Geom::Point const p)
 #if 0
 Geom::Matrix const sp_desktop_root2dt_affine (SPDesktop const *dt)
 {
-	SPRoot const *root = SP_ROOT(SP_DOCUMENT_ROOT(dt->doc()));
-	return root->c2p * dt->doc2dt();
+    SPRoot const *root = SP_ROOT(SP_DOCUMENT_ROOT(dt->doc()));
+    return root->c2p * dt->doc2dt();
 }
 
 Geom::Matrix const sp_desktop_dt2root_affine (SPDesktop const *dt)
 {
-	return sp_desktop_root2dt_affine(dt).inverse();
+    return sp_desktop_root2dt_affine(dt).inverse();
 }
 
 Geom::Point sp_desktop_root2dt_xy_point(SPDesktop const *dt, Geom::Point const p)
 {
-	return p * sp_desktop_root2dt_affine(dt);
+    return p * sp_desktop_root2dt_affine(dt);
 }
 
 Geom::Point sp_desktop_dt2root_xy_point(SPDesktop const *dt, Geom::Point const p)
 {
-	return p * sp_desktop_dt2root_affine(dt);
+    return p * sp_desktop_dt2root_affine(dt);
 }
 #endif
 
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 950452c87..467b34cff 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -43,14 +43,6 @@
 #include "svg/svg.h"
 #include "svg/svg-color.h"
 
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/nr-matrix-ops.h"
-
-#include "libnr/nr-matrix-translate-ops.h"
-#include "libnr/nr-translate-ops.h"
-#include "libnr/nr-translate-rotate-ops.h"
-#include "libnr/nr-translate-scale-ops.h"
-
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
diff --git a/src/dialogs/unclump.cpp b/src/dialogs/unclump.cpp
index 2190bf77e..aebcfd908 100644
--- a/src/dialogs/unclump.cpp
+++ b/src/dialogs/unclump.cpp
@@ -10,7 +10,6 @@
 
 #include <algorithm>
 #include <map>
-#include "libnr/nr-matrix-ops.h"
 #include "sp-item.h"
 
 
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 357d67359..aa4b40e17 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -22,9 +22,7 @@
 #include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/inkscape-cairo.h"
-#include "libnr/nr-matrix-fns.h"
 #include <libnr/nr-pixops.h>
-#include <libnr/nr-convert2geom.h>
 #include "helper/geom.h"
 
 /*
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index f7a8cfb01..e46112a09 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -25,7 +25,6 @@
 #endif
 #include <color.h>
 
-#include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-pixops.h>
 
 static void sp_canvastext_class_init (SPCanvasTextClass *klass);
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index 4a4cb78ec..ffeaebe8e 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -12,7 +12,6 @@
 #include <glib/gmessages.h>
 
 #include "libnr/nr-pixblock.h"
-#include "libnr/nr-matrix.h"
 #include "display/nr-3dutils.h"
 #include <cmath>
 
diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index ef60f0502..802fe448c 100644
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -17,8 +17,6 @@
 # include <config.h>
 #endif
 #include <libnr/nr-blit.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-convert2geom.h>
 #include <2geom/matrix.h>
 #include "../style.h"
@@ -146,7 +144,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*s
 
     if (!glyphs->style->fill.isNone()) {
         Geom::Matrix t;
-        t = to_2geom(glyphs->g_transform) * gc->transform;
+        t = glyphs->g_transform * gc->transform;
         glyphs->x = t[4];
         glyphs->y = t[5];
         t[4]=0;
@@ -168,7 +166,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*s
     if (!glyphs->style->stroke.isNone()) {
         /* Build state data */
         Geom::Matrix t;
-        t = to_2geom(glyphs->g_transform) * gc->transform;
+        t = glyphs->g_transform * gc->transform;
         glyphs->x = t[4];
         glyphs->y = t[5];
         t[4]=0;
@@ -465,7 +463,7 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
             Geom::PathVector const * pathv = g->font->PathVector(g->glyph);
 
             cairo_new_path(ct);
-            Geom::Matrix transform = to_2geom(g->g_transform) * group->ctm;
+            Geom::Matrix transform = g->g_transform * group->ctm;
             feed_pathvector_to_cairo (ct, *pathv, transform, to_2geom((pb->area).upgrade()), false, 0);
             cairo_fill(ct);
             pb->empty = FALSE;
diff --git a/src/display/nr-arena-group.cpp b/src/display/nr-arena-group.cpp
index d63d9b704..7692cbf15 100644
--- a/src/display/nr-arena-group.cpp
+++ b/src/display/nr-arena-group.cpp
@@ -22,8 +22,6 @@
 #include "sp-gaussian-blur.h"
 #include "filters/blend.h"
 #include "display/nr-filter-blend.h"
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/nr-matrix-ops.h"
 #include "helper/geom.h"
 
 static void nr_arena_group_class_init (NRArenaGroupClass *klass);
diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp
index 3778dc642..147513f6b 100644
--- a/src/display/nr-arena-image.cpp
+++ b/src/display/nr-arena-image.cpp
@@ -149,7 +149,7 @@ nr_arena_image_update( NRArenaItem *item, NRRectL */*area*/, NRGC *gc, unsigned
         image->c10 = (Geom::Point(bbox.x1, bbox.y0) * gc->transform);
         image->c11 = (Geom::Point(bbox.x1, bbox.y1) * gc->transform);
 
-        nr_rect_d_matrix_transform (&bbox, &bbox, from_2geom(gc->transform));
+        nr_rect_d_matrix_transform (&bbox, &bbox, gc->transform);
 
         item->bbox.x0 = (int) floor (bbox.x0);
         item->bbox.y0 = (int) floor (bbox.y0);
diff --git a/src/display/nr-arena-image.h b/src/display/nr-arena-image.h
index d4653a692..209cb8de6 100644
--- a/src/display/nr-arena-image.h
+++ b/src/display/nr-arena-image.h
@@ -17,7 +17,6 @@
 #define NR_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_CAST ((o), NR_TYPE_ARENA_IMAGE, NRArenaImage))
 #define NR_IS_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_TYPE ((o), NR_TYPE_ARENA_IMAGE))
 
-#include <libnr/nr-matrix.h>
 #include "nr-arena-item.h"
 #include "style.h"
 
diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp
index 8e66e13be..04b814cfb 100644
--- a/src/display/nr-arena-item.cpp
+++ b/src/display/nr-arena-item.cpp
@@ -20,15 +20,12 @@
 
 #include <libnr/nr-blit.h>
 #include <libnr/nr-pixops.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
 #include "nr-arena.h"
 #include "nr-arena-item.h"
 #include "gc-core.h"
 #include "helper/geom.h"
 
 #include "nr-filter.h"
-#include "libnr/nr-rect.h"
 #include "nr-arena-group.h"
 #include "preferences.h"
 
diff --git a/src/display/nr-arena-item.h b/src/display/nr-arena-item.h
index 23dd92a43..22c15daef 100644
--- a/src/display/nr-arena-item.h
+++ b/src/display/nr-arena-item.h
@@ -52,7 +52,7 @@
 
 #define NR_ARENA_ITEM_RENDER_NO_CACHE (1 << 0)
 
-#include <libnr/nr-matrix.h>
+#include <2geom/matrix.h>
 #include <libnr/nr-rect-l.h>
 #include <libnr/nr-pixblock.h>
 #include <libnr/nr-object.h>
@@ -60,7 +60,6 @@
 #include "nr-arena-forward.h"
 #include "display/nr-filter.h"
 #include <cairo.h>
-#include <libnr/nr-convert2geom.h>
 
 struct NRGC {
     NRGC(NRGC const *p) : parent(p) {}
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index 4da7819ee..1de9bbfe0 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -30,16 +30,6 @@
 //#include <signal.h>
 //#include <errno.h>
 
-//#include "libnr/nr-point-matrix-ops.h"
-//#include "libnr/nr-rect.h"
-//#include "libnr/nr-matrix.h"
-#include "libnr/nr-matrix-ops.h"
-//#include "libnr/nr-matrix-scale-ops.h"
-//#include "libnr/nr-matrix-translate-ops.h"
-#include "libnr/nr-scale-translate-ops.h"
-//#include "libnr/nr-translate-scale-ops.h"
-//#include "libnr/nr-matrix-fns.h"
-//#include "libnr/nr-pixblock.h"
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
 #include <2geom/bezier-curve.h>
diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h
index ab9a1a4cf..5c1d8439d 100644
--- a/src/extension/internal/emf-win32-print.h
+++ b/src/extension/internal/emf-win32-print.h
@@ -20,8 +20,6 @@
 #include "extension/implementation/implementation.h"
 //#include "extension/extension.h"
 
-//#include "libnr/nr-matrix.h"
-//#include "libnr/nr-rect.h"
 #include <2geom/pathvector.h>
 
 #include <stack>
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 84e493afa..789e5ea34 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -19,14 +19,6 @@
 #include <signal.h>
 #include <errno.h>
 
-
-#include "libnr/nr-matrix.h" 
-#include "libnr/nr-matrix-ops.h" 
-#include "libnr/nr-matrix-scale-ops.h"
-#include "libnr/nr-matrix-translate-ops.h"
-#include "libnr/nr-scale-translate-ops.h"
-#include "libnr/nr-translate-scale-ops.h"
-#include <libnr/nr-matrix-fns.h>
 #include <2geom/pathvector.h>
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/bezier-curve.h>
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index f58e37173..5a3015aef 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -34,7 +34,6 @@
 #include "io/stringstream.h"
 #include "io/base64stream.h"
 #include "display/nr-filter-utils.h"
-#include "libnr/nr-matrix-ops.h"
 #include "libnr/nr-macros.h"
 #include "libnrtype/font-instance.h"
 
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index 28f7e1be3..29add9a62 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -26,8 +26,8 @@ namespace Inkscape {
     }
 }
 
-#include "libnr/nr-point.h"
-#include "libnr/nr-matrix.h"
+#include <2geom/point.h>
+#include <2geom/matrix.h>
 
 #include "CharTypes.h"
 class GooString;
diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
index 0fa70d734..21f278858 100644
--- a/src/extension/internal/win32.cpp
+++ b/src/extension/internal/win32.cpp
@@ -15,7 +15,7 @@
 
 #include <glib/gmem.h>
 #include <libnr/nr-macros.h>
-#include <libnr/nr-matrix.h>
+#include <2geom/transforms.h>
 
 #include "display/nr-arena-item.h"
 #include "display/nr-arena.h"