Use LinkableValueNode members functions when possible in the derived valuenodes.

[synfig.git] / synfig-core / src / synfig / valuenode_segcalcvertex.cpp

diff --git a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
index 9170907..419a995 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
@@ -57,6 +57,8 @@ using namespace synfig;
 ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
        LinkableValueNode(x)
 {
+       Vocab ret(get_children_vocab());
+       set_children_vocab(ret);
        if(x!=ValueBase::TYPE_VECTOR)
                throw Exception::BadType(ValueBase::type_local_name(x));
 
@@ -133,47 +135,6 @@ ValueNode_SegCalcVertex::get_link_vfunc(int i)const
        return 0;
 }
 
-int
-ValueNode_SegCalcVertex::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_SegCalcVertex::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "segment";
-       if(i==1)
-               return "amount";
-       return String();
-}
-
-String
-ValueNode_SegCalcVertex::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Segment");
-       if(i==1)
-               return _("Amount");
-       return String();
-}
-
-int
-ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const
-{
-       if(name=="segment")
-               return 0;
-       if(name=="amount")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-
 LinkableValueNode*
 ValueNode_SegCalcVertex::create_new()const
 {
@@ -181,8 +142,11 @@ ValueNode_SegCalcVertex::create_new()const
 }
 
 LinkableValueNode::Vocab
-ValueNode_SegCalcVertex::get_param_vocab()const
+ValueNode_SegCalcVertex::get_children_vocab_vfunc()const
 {
+       if(children_vocab.size())
+               return children_vocab;
+
        LinkableValueNode::Vocab ret;
 
        ret.push_back(ParamDesc(ValueBase(),"segment")