From: dooglus Date: Mon, 12 Mar 2007 22:31:26 +0000 (+0000) Subject: Fixed a typo: 'candidate', not 'canidate'. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=dee84efa006428fdfbf0e84b66ee94eb23113ad9;p=synfig.git Fixed a typo: 'candidate', not 'canidate'. git-svn-id: http://svn.voria.com/code@302 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 6c4b6cb..1ec6903 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -644,17 +644,17 @@ Instance::safe_close() void Instance::add_actions_to_group(const Glib::RefPtr& action_group, synfig::String& ui_info, const synfigapp::Action::ParamList ¶m_list, synfigapp::Action::Category category)const { - synfigapp::Action::CanidateList canidate_list; - synfigapp::Action::CanidateList::iterator iter; + synfigapp::Action::CandidateList candidate_list; + synfigapp::Action::CandidateList::iterator iter; - canidate_list=compile_canidate_list(param_list,category); + candidate_list=compile_candidate_list(param_list,category); - canidate_list.sort(); + candidate_list.sort(); - if(canidate_list.empty()) - synfig::warning("Action CanidateList is empty!"); + if(candidate_list.empty()) + synfig::warning("Action CandidateList is empty!"); - for(iter=canidate_list.begin();iter!=canidate_list.end();++iter) + for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { Gtk::StockID stock_id(get_action_stock_id(*iter)); @@ -684,17 +684,17 @@ Instance::add_actions_to_group(const Glib::RefPtr& action_grou void Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamList ¶m_list,synfigapp::Action::Category category)const { - synfigapp::Action::CanidateList canidate_list; - synfigapp::Action::CanidateList::iterator iter; + synfigapp::Action::CandidateList candidate_list; + synfigapp::Action::CandidateList::iterator iter; - canidate_list=compile_canidate_list(param_list,category); + candidate_list=compile_candidate_list(param_list,category); - canidate_list.sort(); + candidate_list.sort(); - if(canidate_list.empty()) - synfig::warning("Action CanidateList is empty!"); + if(candidate_list.empty()) + synfig::warning("Action CandidateList is empty!"); - for(iter=canidate_list.begin();iter!=canidate_list.end();++iter) + for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { if(!(iter->category&synfigapp::Action::CATEGORY_HIDDEN)) { @@ -750,30 +750,30 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis void Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamList ¶m_list,const synfigapp::Action::ParamList ¶m_list2,synfigapp::Action::Category category)const { - synfigapp::Action::CanidateList canidate_list; - synfigapp::Action::CanidateList canidate_list2; + synfigapp::Action::CandidateList candidate_list; + synfigapp::Action::CandidateList candidate_list2; - synfigapp::Action::CanidateList::iterator iter; + synfigapp::Action::CandidateList::iterator iter; - canidate_list=compile_canidate_list(param_list,category); - canidate_list2=compile_canidate_list(param_list2,category); + candidate_list=compile_candidate_list(param_list,category); + candidate_list2=compile_candidate_list(param_list2,category); - canidate_list.sort(); + candidate_list.sort(); - if(canidate_list.empty()) - synfig::warning("Action CanidateList is empty!"); - if(canidate_list2.empty()) - synfig::warning("Action CanidateList2 is empty!"); + if(candidate_list.empty()) + synfig::warning("Action CandidateList is empty!"); + if(candidate_list2.empty()) + synfig::warning("Action CandidateList2 is empty!"); - // Seperate out the canidate lists so that there are no conflicts - for(iter=canidate_list.begin();iter!=canidate_list.end();++iter) + // Seperate out the candidate lists so that there are no conflicts + for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { - synfigapp::Action::CanidateList::iterator iter2(canidate_list2.find(iter->name)); - if(iter2!=canidate_list2.end()) - canidate_list2.erase(iter2); + synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name)); + if(iter2!=candidate_list2.end()) + candidate_list2.erase(iter2); } - for(iter=canidate_list2.begin();iter!=canidate_list2.end();++iter) + for(iter=candidate_list2.begin();iter!=candidate_list2.end();++iter) { if(!(iter->category&synfigapp::Action::CATEGORY_HIDDEN)) { @@ -824,7 +824,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis } } - for(iter=canidate_list.begin();iter!=canidate_list.end();++iter) + for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { if(!(iter->category&synfigapp::Action::CATEGORY_HIDDEN)) { diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp index f22de86..04d20f5 100644 --- a/synfig-studio/trunk/src/synfigapp/action.cpp +++ b/synfig-studio/trunk/src/synfigapp/action.cpp @@ -135,7 +135,7 @@ synfigapp::Action::Book *book_; be.category=x::category__; \ be.factory=x::create; \ be.get_param_vocab=x::get_param_vocab; \ - be.is_canidate=x::is_canidate; \ + be.is_candidate=x::is_candidate; \ } @@ -238,10 +238,10 @@ Action::create(const String &name) } -Action::CanidateList -Action::compile_canidate_list(const ParamList& param_list, Category category) +Action::CandidateList +Action::compile_candidate_list(const ParamList& param_list, Category category) { - Action::CanidateList ret; + Action::CandidateList ret; Book::const_iterator iter; @@ -251,11 +251,11 @@ Action::compile_canidate_list(const ParamList& param_list, Category category) { if((iter->second.category&category)) { - if(iter->second.is_canidate(param_list)) + if(iter->second.is_candidate(param_list)) ret.push_back(iter->second); else { - //synfig::info("Action \"%s\" is not a canidate",iter->second.name.c_str()); + //synfig::info("Action \"%s\" is not a candidate",iter->second.name.c_str()); } } } @@ -263,8 +263,8 @@ Action::compile_canidate_list(const ParamList& param_list, Category category) return ret; } -Action::CanidateList::iterator -Action::CanidateList::find(const String& x) +Action::CandidateList::iterator +Action::CandidateList::find(const String& x) { iterator iter; for(iter=begin();iter!=end();++iter) diff --git a/synfig-studio/trunk/src/synfigapp/action.h b/synfig-studio/trunk/src/synfigapp/action.h index 8ea4302..b2d9e77 100644 --- a/synfig-studio/trunk/src/synfigapp/action.h +++ b/synfig-studio/trunk/src/synfigapp/action.h @@ -179,7 +179,7 @@ inline Category operator|(Category lhs, Category rhs) //! Action Base Class /*! An action should implement the following functions: -** static bool is_canidate(const ParamList &x); +** static bool is_candidate(const ParamList &x); ** - Checks the ParamList to see if this action could be performed. ** static ParamVocab get_param_vocab(); ** - Yields the ParamVocab object which describes what @@ -210,7 +210,7 @@ public: }; // END of class Action::Base typedef Action::Base* (*Factory)(); -typedef bool (*CanidateChecker)(const ParamList &x); +typedef bool (*CandidateChecker)(const ParamList &x); typedef ParamVocab (*GetParamVocab)(); typedef etl::handle Handle; @@ -341,7 +341,7 @@ struct BookEntry int priority; Category category; Factory factory; - CanidateChecker is_canidate; + CandidateChecker is_candidate; GetParamVocab get_param_vocab; bool operator<(const BookEntry &rhs)const { return priority Book; -class CanidateList : public std::list +class CandidateList : public std::list { public: iterator find(const synfig::String& x); - const_iterator find(const synfig::String& x)const { return const_cast(this)->find(x); } + const_iterator find(const synfig::String& x)const { return const_cast(this)->find(x); } }; Book& book(); Handle create(const synfig::String &name); -//! Compiles a list of potential canidate actions with the given \a param_list and \a category -CanidateList compile_canidate_list(const ParamList& param_list, Category category=CATEGORY_ALL); +//! Compiles a list of potential candidate actions with the given \a param_list and \a category +CandidateList compile_candidate_list(const ParamList& param_list, Category category=CATEGORY_ALL); /*! \class synfigapp::Action::Main ** \brief \writeme diff --git a/synfig-studio/trunk/src/synfigapp/action_param.cpp b/synfig-studio/trunk/src/synfigapp/action_param.cpp index ed70296..4ab3b33 100644 --- a/synfig-studio/trunk/src/synfigapp/action_param.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_param.cpp @@ -44,7 +44,7 @@ using namespace Action; /* === P R O C E D U R E S ================================================= */ bool -Action::canidate_check(const ParamVocab& param_vocab, const ParamList& param_list) +Action::candidate_check(const ParamVocab& param_vocab, const ParamList& param_list) { ParamVocab::const_iterator iter; diff --git a/synfig-studio/trunk/src/synfigapp/action_param.h b/synfig-studio/trunk/src/synfigapp/action_param.h index 6795595..754e976 100644 --- a/synfig-studio/trunk/src/synfigapp/action_param.h +++ b/synfig-studio/trunk/src/synfigapp/action_param.h @@ -226,7 +226,7 @@ public: class ParamVocab : public std::list< ParamDesc > { }; -bool canidate_check(const ParamVocab& param_vocab, const ParamList& param_list); +bool candidate_check(const ParamVocab& param_vocab, const ParamList& param_list); }; // END of namespace Action diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp index 68ee18a..324bf6e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp @@ -89,9 +89,9 @@ Action::ActivepointAdd::get_param_vocab() } bool -Action::ActivepointAdd::is_canidate(const ParamList &x) +Action::ActivepointAdd::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.h b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.h index 2223533..d2e62b3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.h @@ -62,7 +62,7 @@ public: ActivepointAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp index cde0308..ec3cd44 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp @@ -81,9 +81,9 @@ Action::ActivepointRemove::get_param_vocab() } bool -Action::ActivepointRemove::is_canidate(const ParamList &x) +Action::ActivepointRemove::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.h b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.h index d24a97d..08b114c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.h @@ -58,7 +58,7 @@ public: ActivepointRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp index 3432d56..b0ee32a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp @@ -81,9 +81,9 @@ Action::ActivepointSet::get_param_vocab() } bool -Action::ActivepointSet::is_canidate(const ParamList &x) +Action::ActivepointSet::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointset.h b/synfig-studio/trunk/src/synfigapp/actions/activepointset.h index 956a7db..2c116b7 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointset.h @@ -62,7 +62,7 @@ public: ActivepointSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp index d0d2f58..8824a27 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp @@ -95,15 +95,15 @@ Action::ActivepointSetOff::get_param_vocab() } bool -Action::ActivepointSetOff::is_canidate(const ParamList &x) +Action::ActivepointSetOff::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) return false; - // We are only a canidate if this canvas is animated. + // We are only a candidate if this canvas is animated. Canvas::Handle canvas(x.find("canvas")->second.get_canvas()); if(canvas->rend_desc().get_time_start()==canvas->rend_desc().get_time_end()) return false; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.h b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.h index aa50a29..1675f6b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.h @@ -62,7 +62,7 @@ public: ActivepointSetOff(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp index 75f678f..41ad8d2 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp @@ -95,15 +95,15 @@ Action::ActivepointSetOn::get_param_vocab() } bool -Action::ActivepointSetOn::is_canidate(const ParamList &x) +Action::ActivepointSetOn::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) return false; - // We are only a canidate if this canvas is animated. + // We are only a candidate if this canvas is animated. Canvas::Handle canvas(x.find("canvas")->second.get_canvas()); if(canvas->rend_desc().get_time_start()==canvas->rend_desc().get_time_end()) return false; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.h b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.h index b4e2a48..212bfca 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.h @@ -62,7 +62,7 @@ public: ActivepointSetOn(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp index c0a5507..7a36b37 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp @@ -96,9 +96,9 @@ Action::ActivepointSetSmart::get_param_vocab() } bool -Action::ActivepointSetSmart::is_canidate(const ParamList &x) +Action::ActivepointSetSmart::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.h b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.h index 58145ad..8a419d8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.h @@ -65,7 +65,7 @@ public: ActivepointSetSmart(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp index c9f3bdd..940efb8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp @@ -81,9 +81,9 @@ Action::ActivepointSimpleAdd::get_param_vocab() } bool -Action::ActivepointSimpleAdd::is_canidate(const ParamList &x) +Action::ActivepointSimpleAdd::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) @@ -91,7 +91,7 @@ Action::ActivepointSimpleAdd::is_canidate(const ParamList &x) return true; } - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.h b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.h index b58b4ed..ce169bd 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.h @@ -62,7 +62,7 @@ public: ActivepointSimpleAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp index d2cfd32..39e6a17 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp @@ -86,9 +86,9 @@ Action::BLinePointTangentMerge::get_param_vocab() } bool -Action::BLinePointTangentMerge::is_canidate(const ParamList &x) +Action::BLinePointTangentMerge::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueNode_Composite::Handle value_node; value_node=ValueNode_Composite::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.h b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.h index faef0e8..7f2d9cd 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.h +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.h @@ -55,7 +55,7 @@ public: BLinePointTangentMerge(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp index ccc9205..e799fd3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp @@ -86,9 +86,9 @@ Action::BLinePointTangentSplit::get_param_vocab() } bool -Action::BLinePointTangentSplit::is_canidate(const ParamList &x) +Action::BLinePointTangentSplit::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueNode_Composite::Handle value_node; value_node=ValueNode_Composite::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.h b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.h index f1fcf89..12f6de5 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.h +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.h @@ -55,7 +55,7 @@ public: BLinePointTangentSplit(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp index b0d98b1..bf2b7bb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp @@ -82,9 +82,9 @@ Action::CanvasAdd::get_param_vocab() } bool -Action::CanvasAdd::is_canidate(const ParamList &x) +Action::CanvasAdd::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.h b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.h index 8a67c2f..8c63f9c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.h @@ -58,7 +58,7 @@ public: CanvasAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp index df79a46..cd5ba09 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp @@ -70,9 +70,9 @@ Action::CanvasRemove::get_param_vocab() } bool -Action::CanvasRemove::is_canidate(const ParamList &x) +Action::CanvasRemove::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { Canvas::Handle canvas=x.find("canvas")->second.get_canvas(); assert(canvas); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.h b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.h index f0e9c42..3cafc9e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.h @@ -54,7 +54,7 @@ public: CanvasRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp index 5f9c984..1c68411 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp @@ -75,9 +75,9 @@ Action::CanvasRendDescSet::get_param_vocab() } bool -Action::CanvasRendDescSet::is_canidate(const ParamList &x) +Action::CanvasRendDescSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.h b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.h index fe74f41..283b95c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.h @@ -56,7 +56,7 @@ public: CanvasRendDescSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp index 967b070..a9b535d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp @@ -86,9 +86,9 @@ Action::ColorSet::get_param_vocab() } bool -Action::ColorSet::is_canidate(const ParamList &x) +Action::ColorSet::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; return x.find("value_desc")->second.get_value_desc().get_value_type()==ValueBase::TYPE_COLOR; } diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.h b/synfig-studio/trunk/src/synfigapp/actions/colorset.h index a7d879d..1adb4c4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/colorset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.h @@ -55,7 +55,7 @@ public: ColorSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp index 3aaba06..48a4e4e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp @@ -74,9 +74,9 @@ Action::EditModeSet::get_param_vocab() } bool -Action::EditModeSet::is_canidate(const ParamList &x) +Action::EditModeSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.h b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.h index e6d4d6c..7925e1c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.h @@ -53,7 +53,7 @@ public: EditModeSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp index c1d8649..8f19c99 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp @@ -86,9 +86,9 @@ Action::GradientSet::get_param_vocab() } bool -Action::GradientSet::is_canidate(const ParamList &x) +Action::GradientSet::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; return x.find("value_desc")->second.get_value_desc().get_value_type()==ValueBase::TYPE_GRADIENT; } diff --git a/synfig-studio/trunk/src/synfigapp/actions/gradientset.h b/synfig-studio/trunk/src/synfigapp/actions/gradientset.h index 979906c..2c72c11 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/gradientset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/gradientset.h @@ -56,7 +56,7 @@ public: GradientSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp index 3e93b56..369dd45 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp @@ -82,9 +82,9 @@ Action::GroupAddLayers::get_param_vocab() } bool -Action::GroupAddLayers::is_canidate(const ParamList &x) +Action::GroupAddLayers::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.h b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.h index f5c2399..1292c39 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.h +++ b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.h @@ -60,7 +60,7 @@ public: GroupAddLayers(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp index 640b8a1..ee7842b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp @@ -75,12 +75,12 @@ Action::GroupRemove::get_param_vocab() } bool -Action::GroupRemove::is_canidate(const ParamList &x) +Action::GroupRemove::is_candidate(const ParamList &x) { - bool ret(canidate_check(get_param_vocab(),x)); + bool ret(candidate_check(get_param_vocab(),x)); if(!ret) { - synfig::info("Action::GroupRemove::is_canidate(): failed canidate check"); + synfig::info("Action::GroupRemove::is_candidate(): failed candidate check"); ParamList::const_iterator iter; for(iter=x.begin();iter!=x.end();++iter) { diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremove.h b/synfig-studio/trunk/src/synfigapp/actions/groupremove.h index 4c6f980..824bd05 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremove.h @@ -60,7 +60,7 @@ public: GroupRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp index f2e5e1d..a8d4dc9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp @@ -82,9 +82,9 @@ Action::GroupRemoveLayers::get_param_vocab() } bool -Action::GroupRemoveLayers::is_canidate(const ParamList &x) +Action::GroupRemoveLayers::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.h b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.h index da73752..08a114d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.h +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.h @@ -60,7 +60,7 @@ public: GroupRemoveLayers(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp index 2130a87..e094b10 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp @@ -80,9 +80,9 @@ Action::GroupRename::get_param_vocab() } bool -Action::GroupRename::is_canidate(const ParamList &x) +Action::GroupRename::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/grouprename.h b/synfig-studio/trunk/src/synfigapp/actions/grouprename.h index 9b2cebe..c96088d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/grouprename.h +++ b/synfig-studio/trunk/src/synfigapp/actions/grouprename.h @@ -62,7 +62,7 @@ public: GroupRename(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp index cd73e6c..db3b7a5 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp @@ -77,9 +77,9 @@ Action::KeyframeAdd::get_param_vocab() } bool -Action::KeyframeAdd::is_canidate(const ParamList &x) +Action::KeyframeAdd::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; return true; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.h b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.h index 5d59eea..847c23e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.h @@ -55,7 +55,7 @@ public: KeyframeAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp index eb8493e..48ddf07 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp @@ -86,9 +86,9 @@ Action::KeyframeDuplicate::get_param_vocab() } bool -Action::KeyframeDuplicate::is_canidate(const ParamList &x) +Action::KeyframeDuplicate::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.h b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.h index 83ded7b..5c6c415 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.h @@ -57,7 +57,7 @@ public: KeyframeDuplicate(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp index b1a14da..eaa3bb1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp @@ -81,9 +81,9 @@ Action::KeyframeRemove::get_param_vocab() } bool -Action::KeyframeRemove::is_canidate(const ParamList &x) +Action::KeyframeRemove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.h b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.h index ca6624e..fcfa4f1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.h @@ -56,7 +56,7 @@ public: KeyframeRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp index bfbee21..039497e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp @@ -81,9 +81,9 @@ Action::KeyframeSet::get_param_vocab() } bool -Action::KeyframeSet::is_canidate(const ParamList &x) +Action::KeyframeSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h index f5243fd..c6c70b8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h @@ -69,7 +69,7 @@ public: KeyframeSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp index d9fb0ea..4eabd69 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp @@ -84,9 +84,9 @@ Action::KeyframeSetDelta::get_param_vocab() } bool -Action::KeyframeSetDelta::is_canidate(const ParamList &x) +Action::KeyframeSetDelta::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.h b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.h index ed127a6..7a29dac 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.h @@ -64,7 +64,7 @@ public: KeyframeSetDelta(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp index a85b70e..78e6d8c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp @@ -84,9 +84,9 @@ Action::KeyframeWaypointSet::get_param_vocab() } bool -Action::KeyframeWaypointSet::is_canidate(const ParamList &x) +Action::KeyframeWaypointSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.h b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.h index bcf3102..f01840c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.h @@ -59,7 +59,7 @@ public: KeyframeWaypointSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp index 6549cd3..7e29845 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp @@ -96,9 +96,9 @@ Action::LayerActivate::get_param_vocab() } bool -Action::LayerActivate::is_canidate(const ParamList &x) +Action::LayerActivate::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.h b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.h index e41b724..78c84f3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.h @@ -57,7 +57,7 @@ public: LayerActivate(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp index 5915487..31167be 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp @@ -75,9 +75,9 @@ Action::LayerAdd::get_param_vocab() } bool -Action::LayerAdd::is_canidate(const ParamList &x) +Action::LayerAdd::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeradd.h b/synfig-studio/trunk/src/synfigapp/actions/layeradd.h index 8766b33..b7dea55 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeradd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layeradd.h @@ -55,7 +55,7 @@ public: LayerAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp index 4f6b2de..56d3444 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp @@ -77,9 +77,9 @@ Action::LayerDuplicate::get_param_vocab() } bool -Action::LayerDuplicate::is_canidate(const ParamList &x) +Action::LayerDuplicate::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.h b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.h index 8257831..fafa730 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.h @@ -55,7 +55,7 @@ public: LayerDuplicate(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp index 069fcee..bf4e22b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp @@ -78,9 +78,9 @@ Action::LayerEncapsulate::get_param_vocab() } bool -Action::LayerEncapsulate::is_canidate(const ParamList &x) +Action::LayerEncapsulate::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.h b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.h index e5ddda1..e21144c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.h @@ -56,7 +56,7 @@ public: LayerEncapsulate(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp index 00ffc15..6fc401c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp @@ -77,9 +77,9 @@ Action::LayerLower::get_param_vocab() } bool -Action::LayerLower::is_canidate(const ParamList &x) +Action::LayerLower::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; Layer::Handle layer(x.find("layer")->second.get_layer()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerlower.h b/synfig-studio/trunk/src/synfigapp/actions/layerlower.h index c2e3b07..be1a15a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerlower.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerlower.h @@ -53,7 +53,7 @@ public: LayerLower(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp index 7c30c04..ca16dd3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp @@ -89,9 +89,9 @@ Action::LayerMove::get_param_vocab() } bool -Action::LayerMove::is_canidate(const ParamList &x) +Action::LayerMove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layermove.h b/synfig-studio/trunk/src/synfigapp/actions/layermove.h index a8ec425..d7f2195 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layermove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layermove.h @@ -60,7 +60,7 @@ public: LayerMove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp index 00ebfb1..d1bfb81 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp @@ -82,9 +82,9 @@ Action::LayerParamConnect::get_param_vocab() } bool -Action::LayerParamConnect::is_canidate(const ParamList &x) +Action::LayerParamConnect::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.h b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.h index e20600a..504a882 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.h @@ -60,7 +60,7 @@ public: LayerParamConnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp index 15781d8..49e9f95 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp @@ -86,9 +86,9 @@ Action::LayerParamDisconnect::get_param_vocab() } bool -Action::LayerParamDisconnect::is_canidate(const ParamList &x) +Action::LayerParamDisconnect::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.h b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.h index 5dd2f4f..3a143d4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.h @@ -59,7 +59,7 @@ public: LayerParamDisconnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp index f249191..de500cb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp @@ -82,9 +82,9 @@ Action::LayerParamSet::get_param_vocab() } bool -Action::LayerParamSet::is_canidate(const ParamList &x) +Action::LayerParamSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.h b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.h index a123f6e..35c9efb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.h @@ -59,7 +59,7 @@ public: LayerParamSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp index fcc3616..1efbb8e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp @@ -77,9 +77,9 @@ Action::LayerRaise::get_param_vocab() } bool -Action::LayerRaise::is_canidate(const ParamList &x) +Action::LayerRaise::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; if(x.find("layer")->second.get_layer()->get_depth()==0) return false; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerraise.h b/synfig-studio/trunk/src/synfigapp/actions/layerraise.h index 67ef735..f9ecb32 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerraise.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerraise.h @@ -53,7 +53,7 @@ public: LayerRaise(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp index b485f10..4fd7b0f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp @@ -76,9 +76,9 @@ Action::LayerRemove::get_param_vocab() } bool -Action::LayerRemove::is_canidate(const ParamList &x) +Action::LayerRemove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.h b/synfig-studio/trunk/src/synfigapp/actions/layerremove.h index be12c54..5f35bc3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.h @@ -59,7 +59,7 @@ public: LayerRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp index 6e42333..5018de2 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp @@ -83,9 +83,9 @@ Action::LayerSetDesc::get_param_vocab() } bool -Action::LayerSetDesc::is_canidate(const ParamList &x) +Action::LayerSetDesc::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.h b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.h index e08e023..93ae4e3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.h +++ b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.h @@ -57,7 +57,7 @@ public: LayerSetDesc(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp index 4950d1d..1c8f2e6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp @@ -113,9 +113,9 @@ Action::TimepointsCopy::get_param_vocab() } bool -Action::TimepointsCopy::is_canidate(const ParamList &x) +Action::TimepointsCopy::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; if( x.find("addlayer") == x.end() && diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.h b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.h index a53fc99..e82394b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.h +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.h @@ -63,7 +63,7 @@ public: TimepointsCopy(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp index 9a4475d..5c2039b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp @@ -107,9 +107,9 @@ Action::TimepointsDelete::get_param_vocab() } bool -Action::TimepointsDelete::is_canidate(const ParamList &x) +Action::TimepointsDelete::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; if( x.find("addlayer") == x.end() && diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.h b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.h index 2adb70f..901da75 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.h +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.h @@ -61,7 +61,7 @@ public: TimepointsDelete(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp index 3a6cc84..9799356 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp @@ -113,9 +113,9 @@ Action::TimepointsMove::get_param_vocab() } bool -Action::TimepointsMove::is_canidate(const ParamList &x) +Action::TimepointsMove::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; if( x.find("addlayer") == x.end() && diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.h b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.h index 15ad1d1..b42e954 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.h @@ -66,7 +66,7 @@ public: TimepointsMove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp index 635e41e..7b0c465 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp @@ -89,9 +89,9 @@ Action::ValueDescConnect::get_param_vocab() } bool -Action::ValueDescConnect::is_canidate(const ParamList &x) +Action::ValueDescConnect::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { if(x.count("src")) { diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.h b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.h index 696a6b6..1748ee6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.h @@ -55,7 +55,7 @@ public: ValueDescConnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp index 4aa59ef..c4c9f56 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp @@ -89,9 +89,9 @@ Action::ValueDescConvert::get_param_vocab() } bool -Action::ValueDescConvert::is_canidate(const ParamList &x) +Action::ValueDescConvert::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.h b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.h index c981c03..f10f196 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.h @@ -54,7 +54,7 @@ public: ValueDescConvert(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp index 80535a9..2473b80 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp @@ -85,9 +85,9 @@ Action::ValueDescDisconnect::get_param_vocab() } bool -Action::ValueDescDisconnect::is_canidate(const ParamList &x) +Action::ValueDescDisconnect::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.h b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.h index 7b370de..df1648f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.h @@ -54,7 +54,7 @@ public: ValueDescDisconnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp index 03fbe86..eed8056 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp @@ -86,9 +86,9 @@ Action::ValueDescExport::get_param_vocab() } bool -Action::ValueDescExport::is_canidate(const ParamList &x) +Action::ValueDescExport::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc=x.find("value_desc")->second.get_value_desc(); if(!value_desc || value_desc.parent_is_canvas() || (value_desc.is_value_node() && value_desc.get_value_node()->is_exported())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.h b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.h index 10f91f2..3ba1946 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.h @@ -54,7 +54,7 @@ public: ValueDescExport(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp index c51f319..52d9477 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp @@ -78,9 +78,9 @@ Action::ValueDescLink::get_param_vocab() } bool -Action::ValueDescLink::is_canidate(const ParamList &x) +Action::ValueDescLink::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.h b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.h index ab41852..adecc7d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.h @@ -55,7 +55,7 @@ public: ValueDescLink(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index 60f4d75..fb114fc 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -132,9 +132,9 @@ Action::ValueDescSet::get_param_vocab() } bool -Action::ValueDescSet::is_canidate(const ParamList &x) +Action::ValueDescSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.h b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.h index 1473249..4114554 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.h @@ -57,7 +57,7 @@ public: ValueDescSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp index 12dd3a2..c9201fc 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp @@ -79,9 +79,9 @@ Action::ValueNodeAdd::get_param_vocab() } bool -Action::ValueNodeAdd::is_canidate(const ParamList &x) +Action::ValueNodeAdd::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.h index 83c9dda..d60bd82 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.h @@ -56,7 +56,7 @@ public: ValueNodeAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp index 19103fe..38a5658 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp @@ -79,9 +79,9 @@ Action::ValueNodeConstSet::get_param_vocab() } bool -Action::ValueNodeConstSet::is_canidate(const ParamList &x) +Action::ValueNodeConstSet::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { if(ValueNode_Const::Handle::cast_dynamic(x.find("value_node")->second.get_value_node())) return true; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.h index 12414bb..627c9af 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.h @@ -58,7 +58,7 @@ public: ValueNodeConstSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp index 92203ec..a0199a2 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp @@ -90,9 +90,9 @@ Action::ValueNodeDynamicListInsert::get_param_vocab() } bool -Action::ValueNodeDynamicListInsert::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListInsert::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.h index 3292503..4957a5f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.h @@ -64,7 +64,7 @@ public: ValueNodeDynamicListInsert(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp index 6413c18..3376b0c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp @@ -87,9 +87,9 @@ Action::ValueNodeDynamicListInsertSmart::get_param_vocab() } bool -Action::ValueNodeDynamicListInsertSmart::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListInsertSmart::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.h index d282f2c..ca289c7 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.h @@ -60,7 +60,7 @@ public: ValueNodeDynamicListInsertSmart(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp index daa8b82..2feb427 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp @@ -74,9 +74,9 @@ Action::ValueNodeDynamicListLoop::get_param_vocab() } bool -Action::ValueNodeDynamicListLoop::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListLoop::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueNode::Handle value_node; ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.h index 53bb217..2c76a98 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.h @@ -59,7 +59,7 @@ public: ValueNodeDynamicListLoop(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp index 5d1b422..732b95c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp @@ -76,9 +76,9 @@ Action::ValueNodeDynamicListRemove::get_param_vocab() } bool -Action::ValueNodeDynamicListRemove::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListRemove::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.h index 0a8bdfc..04a3f63 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.h @@ -59,7 +59,7 @@ public: ValueNodeDynamicListRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp index 9b853d8..bfb3920 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp @@ -87,9 +87,9 @@ Action::ValueNodeDynamicListRemoveSmart::get_param_vocab() } bool -Action::ValueNodeDynamicListRemoveSmart::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListRemoveSmart::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.h index a5adb32..023155a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.h @@ -60,7 +60,7 @@ public: ValueNodeDynamicListRemoveSmart(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp index fa3adb6..4f5886a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp @@ -76,9 +76,9 @@ Action::ValueNodeDynamicListRotateOrder::get_param_vocab() } bool -Action::ValueNodeDynamicListRotateOrder::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListRotateOrder::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.h index 95a598c..4bbdacf 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.h @@ -58,7 +58,7 @@ public: ValueNodeDynamicListRotateOrder(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp index 9b107a2..e53656f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp @@ -74,9 +74,9 @@ Action::ValueNodeDynamicListUnLoop::get_param_vocab() } bool -Action::ValueNodeDynamicListUnLoop::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListUnLoop::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueNode::Handle value_node; ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.h index 9b7ca15..87f5d62 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.h @@ -59,7 +59,7 @@ public: ValueNodeDynamicListUnLoop(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp index 55b8abf..1cf9672 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp @@ -83,9 +83,9 @@ Action::ValueNodeLinkConnect::get_param_vocab() } bool -Action::ValueNodeLinkConnect::is_canidate(const ParamList &x) +Action::ValueNodeLinkConnect::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.h index dd0a094..096c412 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.h @@ -59,7 +59,7 @@ public: ValueNodeLinkConnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp index 1f0011e..0e1dd58 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp @@ -86,9 +86,9 @@ Action::ValueNodeLinkDisconnect::get_param_vocab() } bool -Action::ValueNodeLinkDisconnect::is_canidate(const ParamList &x) +Action::ValueNodeLinkDisconnect::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.h index af206dd..0fb9c08 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.h @@ -58,7 +58,7 @@ public: ValueNodeLinkDisconnect(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp index 8bba7e6..c86042f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp @@ -74,9 +74,9 @@ Action::ValueNodeRemove::get_param_vocab() } bool -Action::ValueNodeRemove::is_canidate(const ParamList &x) +Action::ValueNodeRemove::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { ValueNode::Handle value_node=x.find("value_node")->second.get_value_node(); if(!value_node->is_exported()) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.h b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.h index fcc1cc3..9eb795e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.h @@ -59,7 +59,7 @@ public: ValueNodeRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp index 24702e6..da5d0b5 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp @@ -80,9 +80,9 @@ Action::ValueNodeRename::get_param_vocab() } bool -Action::ValueNodeRename::is_canidate(const ParamList &x) +Action::ValueNodeRename::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { if(x.find("value_node")->second.get_value_node()->is_exported()) return true; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.h b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.h index 316456e..2bf8ef3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.h @@ -58,7 +58,7 @@ public: ValueNodeRename(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp index 3e8047a..1a8bf73 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp @@ -93,9 +93,9 @@ Action::ValueNodeReplace::get_param_vocab() } bool -Action::ValueNodeReplace::is_canidate(const ParamList &x) +Action::ValueNodeReplace::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.h b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.h index 7f86977..4e1ec3d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.h +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.h @@ -57,7 +57,7 @@ public: ValueNodeReplace(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp index 55352b6..c29d8b9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp @@ -90,9 +90,9 @@ Action::WaypointAdd::get_param_vocab() } bool -Action::WaypointAdd::is_canidate(const ParamList &x) +Action::WaypointAdd::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { if(!ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node())) return false; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.h b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.h index d2b2247..15ae928 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.h @@ -64,7 +64,7 @@ public: WaypointAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp index 4fb377a..8b02890 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp @@ -81,9 +81,9 @@ Action::WaypointRemove::get_param_vocab() } bool -Action::WaypointRemove::is_canidate(const ParamList &x) +Action::WaypointRemove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.h b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.h index 81318d3..702f969 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.h +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.h @@ -59,7 +59,7 @@ public: WaypointRemove(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp index 2e7c015..c676aeb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp @@ -81,9 +81,9 @@ Action::WaypointSet::get_param_vocab() } bool -Action::WaypointSet::is_canidate(const ParamList &x) +Action::WaypointSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointset.h b/synfig-studio/trunk/src/synfigapp/actions/waypointset.h index 9d5407b..ac44966 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointset.h +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointset.h @@ -61,7 +61,7 @@ public: WaypointSet(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp index 03c9431..1f6d07a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp @@ -109,9 +109,9 @@ Action::WaypointSetSmart::get_param_vocab() } bool -Action::WaypointSetSmart::is_canidate(const ParamList &x) +Action::WaypointSetSmart::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) + if(candidate_check(get_param_vocab(),x)) { if(!ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node())) return false; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.h b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.h index 2703d4b..8fbb6c8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.h +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.h @@ -64,7 +64,7 @@ public: WaypointSetSmart(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const; diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp index 0873a3b..3af4278 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp @@ -81,9 +81,9 @@ Action::WaypointSimpleAdd::get_param_vocab() } bool -Action::WaypointSimpleAdd::is_canidate(const ParamList &x) +Action::WaypointSimpleAdd::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.h b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.h index 3c3c64a..f56acfa 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.h +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.h @@ -61,7 +61,7 @@ public: WaypointSimpleAdd(); static ParamVocab get_param_vocab(); - static bool is_canidate(const ParamList &x); + static bool is_candidate(const ParamList &x); virtual bool set_param(const synfig::String& name, const Param &); virtual bool is_ready()const;