From 494c671e141564431d7d05f141c885d9a2789db5 Mon Sep 17 00:00:00 2001 From: cilix42 Date: Mon, 18 Aug 2008 00:33:33 +0000 Subject: [PATCH] Rename acceptsNumParams() -> acceptsNumClicks() because it makes more sense --- src/live_effects/effect.cpp | 8 ++++---- src/live_effects/effect.h | 4 ++-- src/sp-lpe-item.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 7d01f63dd..472fe5d9d 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -108,7 +108,7 @@ const Util::EnumData LPETypeData[] = { const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); int -Effect::acceptsNumParams(EffectType type) { +Effect::acceptsNumClicks(EffectType type) { switch (type) { case ANGLE_BISECTOR: return 3; case PERP_BISECTOR: return 2; @@ -298,7 +298,7 @@ Effect::doBeforeEffect (SPLPEItem */*lpeitem*/) /** * Effects can have a parameter path set before they are applied by accepting a nonzero number of * mouse clicks. This method activates the pen context, which waits for the specified number of - * clicks. Override Effect::acceptsNumParams() to return the number of expected mouse clicks. + * clicks. Override Effect::acceptsNumClicks() to return the number of expected mouse clicks. */ void Effect::doAcceptPathPreparations(SPLPEItem *lpeitem) @@ -311,14 +311,14 @@ Effect::doAcceptPathPreparations(SPLPEItem *lpeitem) SPEventContext *ec = desktop->event_context; SPPenContext *pc = SP_PEN_CONTEXT(ec); - pc->expecting_clicks_for_LPE = this->acceptsNumParams(); + pc->expecting_clicks_for_LPE = this->acceptsNumClicks(); pc->waiting_LPE = this; pc->waiting_item = lpeitem; pc->polylines_only = true; ec->desktop->messageStack()->flash(Inkscape::INFORMATION_MESSAGE, g_strdup_printf(_("Please specify a parameter path for the LPE '%s' with %d mouse clicks"), - getName().c_str(), acceptsNumParams())); + getName().c_str(), acceptsNumClicks())); } void diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index e703c888b..a66073881 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -109,8 +109,8 @@ public: void writeParamsToSVG(); virtual void acceptParamPath (SPPath *param_path); - static int acceptsNumParams(EffectType type); - int acceptsNumParams() { return acceptsNumParams(effectType()); } + static int acceptsNumClicks(EffectType type); + int acceptsNumClicks() { return acceptsNumClicks(effectType()); } void doAcceptPathPreparations(SPLPEItem *lpeitem); /* diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 7ff5a7f4b..6e2e65d7d 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -314,7 +314,7 @@ void sp_lpe_item_perform_path_effect(SPLPEItem *lpeitem, SPCurve *curve) { Inkscape::LivePathEffect::Effect *lpe = lpeobj->lpe; if (lpe->isVisible()) { - if (lpe->acceptsNumParams() > 0 && !lpe->isReady()) { + if (lpe->acceptsNumClicks() > 0 && !lpe->isReady()) { // if the effect expects mouse input before being applied and the input is not finished // yet, we don't alter the path return; -- 2.30.2