From 29f466534f28f3e06f68e44ba8d11281baa1e312 Mon Sep 17 00:00:00 2001
From: johanengelen <johanengelen@users.sourceforge.net>
Date: Fri, 4 Jul 2008 20:36:10 +0000
Subject: [PATCH] change some SP_CURVE_BPATH to get_bpath

---
 src/display/curve.cpp              | 3 ++-
 src/extension/internal/odf.cpp     | 2 +-
 src/extension/internal/pov-out.cpp | 4 ++--
 src/splivarot.cpp                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 4276627b4..035b65fd7 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -5,8 +5,9 @@
  */
 
 /*
- * Author:
+ * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Johan Engelen
  *
  * Copyright (C) 2000 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 33242b09e..4efebdafd 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -2050,7 +2050,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts,
                        bbox_width * 1000.0, bbox_height * 1000.0);
 
         couts.printf("    svg:d=\"");
-        int nrPoints = writePath(couts, SP_CURVE_BPATH(curve),
+        int nrPoints = writePath(couts, curve->get_bpath(),
                              tf, bbox_x, bbox_y);
         couts.printf("\"");
 
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 8d701b28e..bfbb0e4d4 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -331,7 +331,7 @@ void PovOutput::doCurves(SPDocument *doc)
 
         //Count the NR_CURVETOs/LINETOs
         int segmentCount=0;
-        NArtBpath const *bp = SP_CURVE_BPATH(curve);
+        NArtBpath const *bp = curve->get_bpath();
         for (int curveNr=0 ; curveNr<curveLength ; curveNr++, bp++)
             if (bp->code == NR_CURVETO || bp->code == NR_LINETO)
                 segmentCount++;
@@ -353,7 +353,7 @@ void PovOutput::doCurves(SPDocument *doc)
         out("    0.0, //bottom\n");
         out("    %d //nr points\n", segmentCount * 4);
         int segmentNr = 0;
-        bp = SP_CURVE_BPATH(curve);
+        bp = curve->get_bpath();
         
         nrSegments += curveLength;
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 5868140a6..944c15f84 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -826,7 +826,7 @@ sp_selected_path_outline()
 
                 SPShape *shape = SP_SHAPE(item);
 
-                for (NArtBpath const* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
+                for (NArtBpath const* bp = curve->get_bpath(); bp->code != NR_END; bp++) {
                     for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
                         if (sp_shape_marker_required (shape, m, bp)) {
 
-- 
2.30.2