From d97dcb5d03fa3e063c597788fa7f2c766ae5916e Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Tue, 17 Jan 2012 23:30:48 +0100 Subject: add underscores to some member variables. add some const stuff (bzr r10900) --- src/splivarot.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/splivarot.cpp') diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 87a1563db..cf4e63ffa 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -821,7 +821,7 @@ Geom::PathVector* item_outline(SPItem const *item, bool coalesce) // START marker for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START - if ( SPObject *marker_obj = shape->marker[i] ) { + if ( SPObject *marker_obj = shape->_marker[i] ) { Geom::Affine const m (sp_shape_marker_get_transform_at_start(pathv.front().front())); item_outline_add_marker( marker_obj, m, Geom::Scale(i_style->stroke_width.computed), @@ -830,7 +830,7 @@ Geom::PathVector* item_outline(SPItem const *item, bool coalesce) } // MID marker for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID - SPObject *midmarker_obj = shape->marker[i]; + SPObject *midmarker_obj = shape->_marker[i]; if (!midmarker_obj) continue; for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) { // START position @@ -873,7 +873,7 @@ Geom::PathVector* item_outline(SPItem const *item, bool coalesce) } // END marker for (int i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END - if ( SPObject *marker_obj = shape->marker[i] ) { + if ( SPObject *marker_obj = shape->_marker[i] ) { /* Get reference to last curve in the path. * For moveto-only path, this returns the "closing line segment". */ Geom::Path const &path_last = pathv.back(); @@ -1139,7 +1139,7 @@ sp_selected_path_outline(SPDesktop *desktop) // START marker for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START - if ( SPObject *marker_obj = shape->marker[i] ) { + if ( SPObject *marker_obj = shape->_marker[i] ) { Geom::Affine const m (sp_shape_marker_get_transform_at_start(pathv.front().front())); sp_selected_path_outline_add_marker( marker_obj, m, Geom::Scale(i_style->stroke_width.computed), transform, @@ -1148,7 +1148,7 @@ sp_selected_path_outline(SPDesktop *desktop) } // MID marker for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID - SPObject *midmarker_obj = shape->marker[i]; + SPObject *midmarker_obj = shape->_marker[i]; if (!midmarker_obj) continue; for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) { // START position @@ -1191,7 +1191,7 @@ sp_selected_path_outline(SPDesktop *desktop) } // END marker for (int i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END - if ( SPObject *marker_obj = shape->marker[i] ) { + if ( SPObject *marker_obj = shape->_marker[i] ) { /* Get reference to last curve in the path. * For moveto-only path, this returns the "closing line segment". */ Geom::Path const &path_last = pathv.back(); -- cgit v1.2.3