From 4c281d3f704bfc4939603a53fd97015107d79fcb Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 12 Nov 2007 18:59:48 +0000 Subject: LPE: no longer overload doEffect methods, but name them according to accepted arguments. This saves developer brain time because of 'hiding' issues. (bzr r4067) --- src/live_effects/effect.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 77e89ddf4..f87e365bc 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -122,7 +122,7 @@ Effect::getName() void Effect::doEffect (SPCurve * curve) { - NArtBpath *new_bpath = doEffect(SP_CURVE_BPATH(curve)); + NArtBpath *new_bpath = doEffect_nartbpath(SP_CURVE_BPATH(curve)); if (new_bpath && new_bpath != SP_CURVE_BPATH(curve)) { // FIXME, add function to SPCurve to change bpath? or a copy function? if (curve->_bpath) { @@ -133,12 +133,12 @@ Effect::doEffect (SPCurve * curve) } NArtBpath * -Effect::doEffect (NArtBpath * path_in) +Effect::doEffect_nartbpath (NArtBpath * path_in) { try { std::vector orig_pathv = BPath_to_2GeomPath(path_in); - std::vector result_pathv = doEffect(orig_pathv); + std::vector result_pathv = doEffect_path(orig_pathv); NArtBpath *new_bpath = BPath_from_2GeomPath(result_pathv); @@ -164,7 +164,7 @@ Effect::doEffect (NArtBpath * path_in) } std::vector -Effect::doEffect (std::vector & path_in) +Effect::doEffect_path (std::vector & path_in) { Geom::Piecewise > pwd2_in; @@ -172,7 +172,7 @@ Effect::doEffect (std::vector & path_in) pwd2_in.concat( path_in[i].toPwSb() ); } - Geom::Piecewise > pwd2_out = doEffect(pwd2_in); + Geom::Piecewise > pwd2_out = doEffect_pwd2(pwd2_in); std::vector path_out = Geom::path_from_piecewise( pwd2_out, LPE_CONVERSION_TOLERANCE); @@ -180,7 +180,7 @@ Effect::doEffect (std::vector & path_in) } Geom::Piecewise > -Effect::doEffect (Geom::Piecewise > & pwd2_in) +Effect::doEffect_pwd2 (Geom::Piecewise > & pwd2_in) { g_warning("Effect has no doEffect implementation"); return pwd2_in; -- cgit v1.2.3