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 6391f39..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,49 +135,28 @@ ValueNode_SegCalcVertex::get_link_vfunc(int i)const
        return 0;
 }
 
-int
-ValueNode_SegCalcVertex::link_count()const
+LinkableValueNode*
+ValueNode_SegCalcVertex::create_new()const
 {
-       return 2;
+       return new ValueNode_SegCalcVertex(ValueBase::TYPE_VECTOR);
 }
 
-String
-ValueNode_SegCalcVertex::link_name(int i)const
+LinkableValueNode::Vocab
+ValueNode_SegCalcVertex::get_children_vocab_vfunc()const
 {
-       assert(i>=0 && i<link_count());
+       if(children_vocab.size())
+               return children_vocab;
 
-       if(i==0)
-               return "segment";
-       if(i==1)
-               return "amount";
-       return String();
-}
+       LinkableValueNode::Vocab ret;
 
-String
-ValueNode_SegCalcVertex::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
+       ret.push_back(ParamDesc(ValueBase(),"segment")
+               .set_local_name(_("Segment"))
+               .set_description(_("The Segment where the vertex is linked to"))
+       );
 
-       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
-{
-       return new ValueNode_SegCalcVertex(ValueBase::TYPE_VECTOR);
+       ret.push_back(ParamDesc(ValueBase(),"amount")
+               .set_local_name(_("Amount"))
+               .set_description(_("The position of the linked vertex on the Segment (0,1]"))
+       );
+       return ret;
 }