NR:: to Geom:: for most of src/extension/

[inkscape.git] / src / print.h

diff --git a/src/print.h b/src/print.h
index 3109b4947e2adf47d37a413882976ce7f8ab4e1c..577a169cf819ebdbebce3f13226559ab30399fe3 100644 (file)
--- a/src/print.h
+++ b/src/print.h
@@ -12,7 +12,8 @@
  */
 
 #include <gtkmm.h>
-#include <libnr/nr-path.h>
+//#include <libnr/nr-path.h>
+#include <2geom/forward.h>
 #include "forward.h"
 #include "extension/extension-forward.h"
 
@@ -20,20 +21,20 @@ struct SPPrintContext {
     Inkscape::Extension::Print *module;
 };
 
-unsigned int sp_print_bind(SPPrintContext *ctx, NR::Matrix const &transform, float opacity);
-unsigned int sp_print_bind(SPPrintContext *ctx, NRMatrix const *transform, float opacity);
+unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Matrix const &transform, float opacity);
+unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Matrix const *transform, float opacity);
 unsigned int sp_print_release(SPPrintContext *ctx);
 unsigned int sp_print_comment(SPPrintContext *ctx, char const *comment);
-unsigned int sp_print_fill(SPPrintContext *ctx, NRBPath const *bpath, NRMatrix const *ctm, SPStyle const *style,
+unsigned int sp_print_fill(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *ctm, SPStyle const *style,
                            NRRect const *pbox, NRRect const *dbox, NRRect const *bbox);
-unsigned int sp_print_stroke(SPPrintContext *ctx, NRBPath const *bpath, NRMatrix const *transform, SPStyle const *style,
+unsigned int sp_print_stroke(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *transform, SPStyle const *style,
                              NRRect const *pbox, NRRect const *dbox, NRRect const *bbox);
 
 unsigned int sp_print_image_R8G8B8A8_N(SPPrintContext *ctx,
                                        guchar *px, unsigned int w, unsigned int h, unsigned int rs,
-                                       NRMatrix const *transform, SPStyle const *style);
+                                       Geom::Matrix const *transform, SPStyle const *style);
 
-unsigned int sp_print_text(SPPrintContext *ctx, char const *text, NR::Point p,
+unsigned int sp_print_text(SPPrintContext *ctx, char const *text, Geom::Point p,
                            SPStyle const *style);
 
 void sp_print_get_param(SPPrintContext *ctx, gchar *name, bool *value);