add underscores to some member variables.

add some const stuff

(bzr r10900)

3 files changed, 14 insertions, 15 deletions

diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 42c60f52c..3926cce29 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -181,7 +181,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx)
 {
     SPShape *shape = SP_SHAPE(item);
 
-    if (!shape->curve) {
+    if (!shape->_curve) {
         return;
     }
 
@@ -189,7 +189,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx)
 
     SPStyle* style = item->style;
 
-    Geom::PathVector const & pathv = shape->curve->get_pathvector();
+    Geom::PathVector const & pathv = shape->_curve->get_pathvector();
     if (pathv.empty()) {
         return;
     }
@@ -198,8 +198,8 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx)
 
     // START marker
     for (int i = 0; i < 2; i++) {  // SP_MARKER_LOC and SP_MARKER_LOC_START
-        if ( shape->marker[i] ) {
-            SPMarker* marker = SP_MARKER (shape->marker[i]);
+        if ( shape->_marker[i] ) {
+            SPMarker* marker = SP_MARKER (shape->_marker[i]);
             Geom::Affine tr;
             if (marker->orient_auto) {
                 tr = sp_shape_marker_get_transform_at_start(pathv.begin()->front());
@@ -211,8 +211,8 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx)
     }
     // MID marker
     for (int i = 0; i < 3; i += 2) {  // SP_MARKER_LOC and SP_MARKER_LOC_MID
-        if ( !shape->marker[i] ) continue;
-        SPMarker* marker = SP_MARKER (shape->marker[i]);
+        if ( !shape->_marker[i] ) continue;
+        SPMarker* marker = SP_MARKER (shape->_marker[i]);
         for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
             // START position
             if ( path_it != pathv.begin() 
@@ -263,8 +263,8 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx)
     }
     // END marker
     for (int i = 0; i < 4; i += 3) {  // SP_MARKER_LOC and SP_MARKER_LOC_END
-        if ( shape->marker[i] ) {
-            SPMarker* marker = SP_MARKER (shape->marker[i]);
+        if ( shape->_marker[i] ) {
+            SPMarker* marker = SP_MARKER (shape->_marker[i]);
 
             /* Get reference to last curve in the path.
              * For moveto-only path, this returns the "closing line segment". */
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 7646946fd..f44640bf1 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -472,8 +472,7 @@ bool JavaFXOutput::doCurve(SPItem *item, const String &id)
     }
 
     SPShape *shape = SP_SHAPE(item);
-    SPCurve *curve = shape->curve;
-    if (curve->is_empty()) {
+    if (shape->_curve->is_empty()) {
         return true;
     }
 
@@ -494,7 +493,7 @@ bool JavaFXOutput::doCurve(SPItem *item, const String &id)
     // convert the path to only lineto's and cubic curveto's:
     Geom::Scale yflip(1.0, -1.0); /// @fixme  hardcoded desktop transform!
     Geom::Affine tf = item->i2dt_affine() * yflip;
-    Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf );
+    Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( shape->_curve->get_pathvector() * tf );
 
     //Count the NR_CURVETOs/LINETOs (including closing line segment)
     guint segmentCount = 0;
@@ -789,7 +788,7 @@ bool JavaFXOutput::doBody(SPDocument *doc, SPObject *obj)
         //### Get the Shape
         if (SP_IS_SHAPE(item)) {//Bulia's suggestion.  Allow all shapes
             SPShape *shape = SP_SHAPE(item);
-            SPCurve *curve = shape->curve;
+            SPCurve *curve = shape->_curve;
             if (!curve->is_empty()) {
                 String jfxid = sanatize(id);
                 out("               %s(),\n", jfxid.c_str());
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index bb00de619..f501b97f1 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -264,9 +264,9 @@ bool PovOutput::doCurve(SPItem *item, const String &id)
         return true;
 
     SPShape *shape = SP_SHAPE(item);
-    SPCurve *curve = shape->curve;
-    if (curve->is_empty())
+    if (shape->_curve->is_empty()) {
         return true;
+    }
 
     nrShapes++;
 
@@ -302,7 +302,7 @@ bool PovOutput::doCurve(SPItem *item, const String &id)
 
     // convert the path to only lineto's and cubic curveto's:
     Geom::Affine tf = item->i2dt_affine();
-    Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf );
+    Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( shape->_curve->get_pathvector() * tf );
 
     /*
      * We need to know the number of segments (NR_CURVETOs/LINETOs, including