diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-05-05 19:00:20 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-05-05 19:00:20 +0000 |
| commit | d955f60393f4f85b0269346f37b4481a1c70205a (patch) | |
| tree | 2dd9a11fe737c4a43c8aa88451acd3c8f766fff2 /src/sp-star.cpp | |
| parent | Cmake: Moved helper macros to their own file and removed *-test.h from inksca... (diff) | |
| download | inkscape-d955f60393f4f85b0269346f37b4481a1c70205a.tar.gz inkscape-d955f60393f4f85b0269346f37b4481a1c70205a.zip | |
struct SPCurve => class SPCurve
change all sp_curve_methods functions to SPCurve::methods.
(bzr r5609)
Diffstat (limited to 'src/sp-star.cpp')
| -rw-r--r-- | src/sp-star.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/sp-star.cpp b/src/sp-star.cpp index 2aeb0cfc0..4c5f9623b 100644 --- a/src/sp-star.cpp +++ b/src/sp-star.cpp @@ -285,7 +285,7 @@ sp_star_update_patheffect(SPLPEItem *lpeitem, bool write) if (write) { Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape); if ( shape->curve != NULL ) { - NArtBpath *abp = sp_curve_first_bpath(shape->curve); + NArtBpath *abp = shape->curve->first_bpath(); if (abp) { gchar *str = sp_svg_write_path(abp); repr->setAttribute("d", str); @@ -434,7 +434,7 @@ sp_star_set_shape (SPShape *shape) { SPStar *star = SP_STAR (shape); - SPCurve *c = sp_curve_new (); + SPCurve *c = new SPCurve (); gint sides = star->sides; bool not_rounded = (fabs (star->rounded) < 1e-4); @@ -443,13 +443,12 @@ sp_star_set_shape (SPShape *shape) // other places that call that function (e.g. the knotholder) need the exact point // draw 1st segment - sp_curve_moveto (c, sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); + c->moveto(sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); if (star->flatsided == false) { if (not_rounded) { - sp_curve_lineto (c, sp_star_get_xy (star, SP_STAR_POINT_KNOT2, 0, true)); + c->lineto(sp_star_get_xy (star, SP_STAR_POINT_KNOT2, 0, true)); } else { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, 0, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, 0, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, 0, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT2, 0, true)); } @@ -458,16 +457,14 @@ sp_star_set_shape (SPShape *shape) // draw all middle segments for (gint i = 1; i < sides; i++) { if (not_rounded) { - sp_curve_lineto (c, sp_star_get_xy (star, SP_STAR_POINT_KNOT1, i, true)); + c->lineto(sp_star_get_xy (star, SP_STAR_POINT_KNOT1, i, true)); } else { if (star->flatsided == false) { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, i - 1, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, i - 1, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT1, i, true)); } else { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i - 1, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i - 1, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT1, i, true)); } @@ -475,10 +472,9 @@ sp_star_set_shape (SPShape *shape) if (star->flatsided == false) { if (not_rounded) { - sp_curve_lineto (c, sp_star_get_xy (star, SP_STAR_POINT_KNOT2, i, true)); + c->lineto(sp_star_get_xy (star, SP_STAR_POINT_KNOT2, i, true)); } else { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, i, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, i, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT2, i, true)); } @@ -487,25 +483,23 @@ sp_star_set_shape (SPShape *shape) // draw last segment if (not_rounded) { - sp_curve_lineto (c, sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); + c->lineto(sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); } else { if (star->flatsided == false) { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, sides - 1, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT2, sides - 1, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, 0, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); } else { - sp_curve_curveto (c, - sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, sides - 1, NEXT), + c->curveto(sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, sides - 1, NEXT), sp_star_get_curvepoint (star, SP_STAR_POINT_KNOT1, 0, PREV), sp_star_get_xy (star, SP_STAR_POINT_KNOT1, 0, true)); } } - sp_curve_closepath (c); + c->closepath(); sp_lpe_item_perform_path_effect(SP_LPE_ITEM (star), c); sp_shape_set_curve_insync (SP_SHAPE (star), c, TRUE); - sp_curve_unref (c); + c->unref(); } void |