remove many needless references to n-art-bpath.h

(bzr r6540)

36 files changed, 1 insertions, 65 deletions

diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 9295beccd..0fbc068a1 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-path.h>
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-convert2geom.h>
diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index 26b4ea67e..b8723e635 100644
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -18,8 +18,6 @@
 #include <display/nr-arena.h>
 #include <display/nr-arena-shape.h>
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-path.h>
 #include <libnr/nr-pixops.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index e70b1beca..2cf363358 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -12,7 +12,6 @@
  * Read the file 'COPYING' for more information.
  */
 
-#include <libnr/n-art-bpath-2geom.h>
 #include <2geom/pathvector.h>
 #include <2geom/transforms.h>
 #include "../style.h"
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index c7676be9e..a127df877 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -24,7 +24,6 @@
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include <glibmm/i18n.h>
-#include "libnr/n-art-bpath.h"
 #include "display/curve.h"
 #include "desktop.h"
 #include "desktop-affine.h"
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 0be132340..5c9e45521 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -22,7 +22,6 @@
 #include <gtkmm/clipboard.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "libnr/n-art-bpath.h"
 #include "macros.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
@@ -44,17 +43,6 @@
 #include "message-context.h"
 #include "libnr/nr-scale-translate-ops.h"
 
-#define C1 0.552
-static NArtBpath const spdc_circle[] = {
-    { NR_MOVETO, 0, 0, 0, 0, -1, 0 },
-    { NR_CURVETO, -1, C1, -C1, 1, 0, 1 },
-    { NR_CURVETO, C1, 1, 1, C1, 1, 0 },
-    { NR_CURVETO, 1, -C1, C1, -1, 0, -1 },
-    { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 },
-    { NR_END, 0, 0, 0, 0, 0, 0 }
-};
-#undef C1
-
 static void sp_dropper_context_class_init(SPDropperContextClass *klass);
 static void sp_dropper_context_init(SPDropperContext *dc);
 
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 75250c604..35e220a49 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -48,8 +48,6 @@
 #include "message-context.h"
 #include "prefs-utils.h"
 #include "pixmaps/cursor-calligraphy.xpm"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
 #include "libnr/nr-matrix-ops.h"
 #include "libnr/nr-scale-translate-ops.h"
 #include "libnr/nr-convert2geom.h"
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index c9da645f0..e56158970 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -28,8 +28,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 610f4fb70..735c3cf7a 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -29,8 +29,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 919bcd12a..6c727a479 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -28,8 +28,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 322efffbd..e7620f319 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -28,7 +28,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-translate-ops.h>
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index acae6d333..977b0eb64 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -35,7 +35,6 @@
 #include "style.h"
 #include "color.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath.h"
 #include "libnr/nr-point-matrix-ops.h"
 #include "gtk/gtk.h"
 #include "print.h"
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d25ec096c..2e0f2d59f 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -24,7 +24,6 @@
 #include <sp-radial-gradient.h>

 #include <style.h>

 #include <display/curve.h>

-#include <libnr/n-art-bpath.h>

 #include <extension/system.h>

 #include <2geom/pathvector.h>

 #include <2geom/rect.h>

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index bb12e0564..01b8e64b5 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -26,7 +26,6 @@
 #include <sp-path.h>
 #include <style.h>
 #include <display/curve.h>
-#include <libnr/n-art-bpath.h>
 #include <extension/system.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp
index 7ee28f87a..cad576975 100644
--- a/src/extension/internal/ps.cpp
+++ b/src/extension/internal/ps.cpp
@@ -31,9 +31,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-fns.h>
-#include <libnr/n-art-bpath-2geom.h>
 
 #include <glib/gmem.h>
 #include <glib/gstrfuncs.h>
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 3c7282629..b11d32f8a 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -63,7 +63,6 @@
 #include "splivarot.h"
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
-#include "libnr/n-art-bpath.h"
 #include "svg/svg.h"
 #include "color.h"
 
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 555b9d32d..64653863b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -27,7 +27,6 @@
 #include "live_effects/lpeobject.h"
 #include "live_effects/parameter/parameter.h"
 #include <glibmm/ustring.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "display/curve.h"
 #include <gtkmm.h>
 
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 123508751..51ca6a558 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -29,7 +29,6 @@ struct SPDocument;
 struct SPDesktop;
 struct SPItem;
 class SPNodeContext;
-class NArtBpath;
 struct LivePathEffectObject;
 
 namespace Gtk {
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index e2672670d..47d029d60 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -12,8 +12,6 @@
 #include "sp-item.h"
 #include "sp-path.h"
 #include "sp-item-group.h"
-//#include <libnr/n-art-bpath.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 
diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp
index c5dfebfad..8b169af3c 100644
--- a/src/live_effects/lpe-circle_with_radius.cpp
+++ b/src/live_effects/lpe-circle_with_radius.cpp
@@ -21,7 +21,6 @@
 
 #include "live_effects/lpe-circle_with_radius.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
 
 // You might need to include other 2geom files. You can add them here:
 #include <2geom/path.h>
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index ef3d4cc82..fad912df7 100755
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -12,9 +12,6 @@
 #include "sp-path.h"
 #include "sp-item-group.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-matrix-fns.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index 74f032fd4..f77434f92 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -21,7 +21,6 @@
 #include "sp-item.h"
 #include "sp-path.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "nodepath.h"
 
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 30ec589af..2240a0c3d 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -10,8 +10,6 @@
 #include "live_effects/lpeobject.h"
 #include "sp-shape.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index 35c6f0933..d60f9acb1 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -15,7 +15,6 @@
 
 #include "live_effects/lpe-perp_bisector.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
 #include "sp-path.h"
 #include "line-geometry.h"
 #include "sp-lpe-item.h"
diff --git a/src/live_effects/lpe-sketch.h b/src/live_effects/lpe-sketch.h
index 051240665..f4881ac55 100644
--- a/src/live_effects/lpe-sketch.h
+++ b/src/live_effects/lpe-sketch.h
@@ -29,7 +29,6 @@ public:
 
 //  Choose to implement one of the doEffect functions. You can delete or comment out the others.
 //    virtual void doEffect (SPCurve * curve);
-//    virtual NArtBpath * doEffect_nartbpath (NArtBpath * path_in);
 //    virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> & path_in);
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index ede13e2d4..b43fd8b36 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -19,7 +19,6 @@
 //        There must be a more convenient way to achieve this.
 #include "sp-path.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath-2geom.h"
 
 #include <2geom/path.h>
 #include <2geom/transforms.h>
diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index 3b578b2c6..f858e0f4b 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -10,7 +10,6 @@
 
 #include <2geom/piecewise.h>
 #include <vector>
-#include <libnr/n-art-bpath.h>
 #include <cstring>
 using std::memcpy;
 
diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h
index c4126e5e6..6ae22bf06 100644
--- a/src/live_effects/lpe-vonkoch.h
+++ b/src/live_effects/lpe-vonkoch.h
@@ -15,8 +15,6 @@
 #include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/bool.h"
 
-#include "libnr/n-art-bpath-2geom.h"
-
 // needed for on-canvas editting:
 #include "tools-switch.h"
 #include "shape-editor.h"
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index c0f1222f2..bd4b5d093 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -9,8 +9,6 @@
 #include "live_effects/lpegroupbbox.h"
 
 #include "sp-item.h"
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/n-art-bpath-2geom.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index e74729b35..df329a10c 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -8,7 +8,6 @@
 
 #include "live_effects/parameter/path.h"
 #include "live_effects/effect.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include <2geom/svg-path-parser.h>
 #include <2geom/sbasis-to-bezier.h>
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 58dbc3cc3..1c9b30dc3 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -37,7 +37,6 @@
 #include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
 #include <glibmm/i18n.h>
-#include "libnr/n-art-bpath.h"
 #include "libnr/nr-point-ops.h"
 #include "helper/units.h"
 #include "macros.h"
diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 397a5a0ff..0a5bc7444 100644
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -34,7 +34,6 @@
 #include "display/canvas-bpath.h"
 #include <glibmm/i18n.h>
 #include "libnr/in-svg-plane.h"
-#include "libnr/n-art-bpath.h"
 #include "context-fns.h"
 #include "sp-namedview.h"
 #include "xml/repr.h"
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index 8f4dead0a..2f8dc7c50 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -37,7 +37,6 @@
 #include "sp-use-reference.h"
 #include "uri.h"
 
-#include "libnr/n-art-bpath.h"
 #include <libnr/nr-matrix-fns.h>
 #include <2geom/pathvector.h>
 
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 654edcc61..e641632d9 100644
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -21,8 +21,6 @@
 #include <glibmm/i18n.h>
 
 #include <display/curve.h>
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-path.h>
 #include <libnr/nr-matrix-fns.h>
 #include <2geom/pathvector.h>
 #include <2geom/bezier-curve.h>
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 9185ec84b..6d592f662 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1741,11 +1741,8 @@ Path *
 Path_for_item(SPItem *item, bool doTransformation, bool transformFull)
 {
     SPCurve *curve = curve_for_item(item);
-    NArtBpath *bpath = bpath_for_curve(item, curve, doTransformation, transformFull, NR::identity(), NR::identity());
-    
-    if (bpath == NULL) {
+    if (curve == NULL)
         return NULL;
-    }
 
     Geom::PathVector pathv = pathvector_for_curve(item, curve, doTransformation, transformFull);
 
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 717d6bdc6..70cd49c81 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -40,8 +40,6 @@
 #include "pixmaps/cursor-push.xpm"
 #include "pixmaps/cursor-roughen.xpm"
 #include "pixmaps/cursor-color.xpm"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
 #include "libnr/nr-maybe.h"
 #include "libnr/nr-matrix-ops.h"
 #include "libnr/nr-scale-translate-ops.h"
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 7d771c0d4..1b9968f89 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -70,7 +70,6 @@
 #include "text-context.h"
 #include "text-editing.h"
 #include "tools-switch.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "path-chemistry.h"
 #include "id-clash.h"
 #include "unit-constants.h"