From 2b2950e88fb6c4bfa36ec91eb86de33c6c27fafe Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Wed, 22 Dec 2010 18:53:45 +0100 Subject: [PATCH] Use LinkableValueNode members functions when possible in the derived valuenodes. --- .../src/modules/mod_noise/valuenode_random.cpp | 52 --------- .../src/modules/mod_noise/valuenode_random.h | 5 - synfig-core/src/synfig/valuenode_add.cpp | 6 - synfig-core/src/synfig/valuenode_add.h | 1 - synfig-core/src/synfig/valuenode_and.cpp | 6 - synfig-core/src/synfig/valuenode_and.h | 1 - synfig-core/src/synfig/valuenode_anglestring.cpp | 6 - synfig-core/src/synfig/valuenode_anglestring.h | 1 - synfig-core/src/synfig/valuenode_atan2.cpp | 41 ------- synfig-core/src/synfig/valuenode_atan2.h | 6 - .../src/synfig/valuenode_blinecalctangent.cpp | 52 --------- .../src/synfig/valuenode_blinecalctangent.h | 5 - .../src/synfig/valuenode_blinecalcvertex.cpp | 43 ------- synfig-core/src/synfig/valuenode_blinecalcvertex.h | 5 - .../src/synfig/valuenode_blinecalcwidth.cpp | 46 -------- synfig-core/src/synfig/valuenode_blinecalcwidth.h | 5 - .../src/synfig/valuenode_blinereversetangent.cpp | 40 ------- .../src/synfig/valuenode_blinereversetangent.h | 5 - synfig-core/src/synfig/valuenode_compare.cpp | 44 -------- synfig-core/src/synfig/valuenode_compare.h | 5 - synfig-core/src/synfig/valuenode_composite.cpp | 124 +-------------------- synfig-core/src/synfig/valuenode_composite.h | 4 - synfig-core/src/synfig/valuenode_cos.cpp | 43 ------- synfig-core/src/synfig/valuenode_cos.h | 6 - synfig-core/src/synfig/valuenode_dotproduct.cpp | 41 ------- synfig-core/src/synfig/valuenode_dotproduct.h | 6 - synfig-core/src/synfig/valuenode_duplicate.cpp | 38 ------- synfig-core/src/synfig/valuenode_duplicate.h | 6 - synfig-core/src/synfig/valuenode_exp.cpp | 41 ------- synfig-core/src/synfig/valuenode_exp.h | 6 - synfig-core/src/synfig/valuenode_gradientcolor.cpp | 43 ------- synfig-core/src/synfig/valuenode_gradientcolor.h | 6 - .../src/synfig/valuenode_gradientrotate.cpp | 47 -------- synfig-core/src/synfig/valuenode_gradientrotate.h | 10 -- synfig-core/src/synfig/valuenode_integer.cpp | 32 ------ synfig-core/src/synfig/valuenode_integer.h | 6 - synfig-core/src/synfig/valuenode_intstring.cpp | 44 -------- synfig-core/src/synfig/valuenode_intstring.h | 6 - synfig-core/src/synfig/valuenode_join.cpp | 47 -------- synfig-core/src/synfig/valuenode_join.h | 6 - synfig-core/src/synfig/valuenode_linear.cpp | 49 -------- synfig-core/src/synfig/valuenode_linear.h | 6 - synfig-core/src/synfig/valuenode_log.cpp | 38 ------- synfig-core/src/synfig/valuenode_log.h | 6 - synfig-core/src/synfig/valuenode_not.cpp | 32 ------ synfig-core/src/synfig/valuenode_not.h | 6 - synfig-core/src/synfig/valuenode_or.cpp | 35 ------ synfig-core/src/synfig/valuenode_or.h | 6 - synfig-core/src/synfig/valuenode_pow.cpp | 41 ------- synfig-core/src/synfig/valuenode_pow.h | 6 - .../src/synfig/valuenode_radialcomposite.cpp | 83 +------------- synfig-core/src/synfig/valuenode_radialcomposite.h | 5 - synfig-core/src/synfig/valuenode_range.cpp | 43 ------- synfig-core/src/synfig/valuenode_range.h | 5 - synfig-core/src/synfig/valuenode_realstring.cpp | 47 -------- synfig-core/src/synfig/valuenode_realstring.h | 6 - synfig-core/src/synfig/valuenode_reciprocal.cpp | 38 ------- synfig-core/src/synfig/valuenode_reciprocal.h | 6 - synfig-core/src/synfig/valuenode_reference.cpp | 39 ------- synfig-core/src/synfig/valuenode_reference.h | 7 -- .../src/synfig/valuenode_repeat_gradient.cpp | 55 --------- synfig-core/src/synfig/valuenode_repeat_gradient.h | 6 - synfig-core/src/synfig/valuenode_scale.cpp | 41 ------- synfig-core/src/synfig/valuenode_scale.h | 7 -- .../src/synfig/valuenode_segcalctangent.cpp | 41 ------- synfig-core/src/synfig/valuenode_segcalctangent.h | 6 - synfig-core/src/synfig/valuenode_segcalcvertex.cpp | 41 ------- synfig-core/src/synfig/valuenode_segcalcvertex.h | 10 -- synfig-core/src/synfig/valuenode_sine.cpp | 41 ------- synfig-core/src/synfig/valuenode_sine.h | 6 - synfig-core/src/synfig/valuenode_step.cpp | 49 -------- synfig-core/src/synfig/valuenode_step.h | 6 - synfig-core/src/synfig/valuenode_stripes.cpp | 60 ---------- synfig-core/src/synfig/valuenode_stripes.h | 6 - synfig-core/src/synfig/valuenode_subtract.cpp | 43 ------- synfig-core/src/synfig/valuenode_subtract.h | 4 - synfig-core/src/synfig/valuenode_switch.cpp | 43 ------- synfig-core/src/synfig/valuenode_switch.h | 7 -- synfig-core/src/synfig/valuenode_timedswap.cpp | 47 -------- synfig-core/src/synfig/valuenode_timedswap.h | 4 - synfig-core/src/synfig/valuenode_timeloop.cpp | 41 ------- synfig-core/src/synfig/valuenode_timeloop.h | 6 - synfig-core/src/synfig/valuenode_timestring.cpp | 38 ------- synfig-core/src/synfig/valuenode_timestring.h | 6 - synfig-core/src/synfig/valuenode_twotone.cpp | 48 -------- synfig-core/src/synfig/valuenode_twotone.h | 6 - synfig-core/src/synfig/valuenode_vectorangle.cpp | 35 ------ synfig-core/src/synfig/valuenode_vectorangle.h | 6 - synfig-core/src/synfig/valuenode_vectorlength.cpp | 35 ------ synfig-core/src/synfig/valuenode_vectorlength.h | 6 - synfig-core/src/synfig/valuenode_vectorx.cpp | 35 ------ synfig-core/src/synfig/valuenode_vectorx.h | 6 - synfig-core/src/synfig/valuenode_vectory.cpp | 35 ------ synfig-core/src/synfig/valuenode_vectory.h | 6 - 94 files changed, 8 insertions(+), 2265 deletions(-) diff --git a/synfig-core/src/modules/mod_noise/valuenode_random.cpp b/synfig-core/src/modules/mod_noise/valuenode_random.cpp index 1aeb325..093f25c 100644 --- a/synfig-core/src/modules/mod_noise/valuenode_random.cpp +++ b/synfig-core/src/modules/mod_noise/valuenode_random.cpp @@ -216,58 +216,6 @@ ValueNode_Random::get_link_vfunc(int i)const return 0; } -int -ValueNode_Random::link_count()const -{ - return 6; -} - -String -ValueNode_Random::link_name(int i)const -{ - assert(i>=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i Handle; typedef etl::handle ConstHandle; - virtual ~ValueNode_RadialComposite(); virtual ValueNode::LooseHandle get_link_vfunc(int i)const; - virtual int link_count()const; virtual String link_name(int i)const; - virtual String link_local_name(int i)const; virtual ValueBase operator()(Time t)const; - - virtual String get_name()const; virtual String get_local_name()const; virtual int get_link_index_from_name(const String &name)const; diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp index e959388..4c9b728 100644 --- a/synfig-core/src/synfig/valuenode_range.cpp +++ b/synfig-core/src/synfig/valuenode_range.cpp @@ -244,49 +244,6 @@ ValueNode_Range::get_link_vfunc(int i)const } } -int -ValueNode_Range::link_count()const -{ - return 3; -} - -String -ValueNode_Range::link_local_name(int i)const -{ - assert(i>=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i Handle; typedef etl::handle ConstHandle; -// static Handle create(const ValueBase::Type &x=ValueBase::TYPE_VECTOR); - - virtual ValueBase operator()(Time t)const; virtual ~ValueNode_SegCalcVertex(); virtual String get_name()const; virtual String get_local_name()const; -// static bool check_type(const ValueBase::Type &type); - virtual ValueNode::LooseHandle get_link_vfunc(int i)const; - virtual int link_count()const; - virtual String link_name(int i)const; - - virtual String link_local_name(int i)const; - virtual int get_link_index_from_name(const String &name)const; protected: LinkableValueNode* create_new()const; diff --git a/synfig-core/src/synfig/valuenode_sine.cpp b/synfig-core/src/synfig/valuenode_sine.cpp index 17d8efc..65552fa 100644 --- a/synfig-core/src/synfig/valuenode_sine.cpp +++ b/synfig-core/src/synfig/valuenode_sine.cpp @@ -141,47 +141,6 @@ ValueNode_Sine::get_link_vfunc(int i)const return 0; } -int -ValueNode_Sine::link_count()const -{ - return 2; -} - -String -ValueNode_Sine::link_name(int i)const -{ - assert(i>=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i=0 && i