Use LinkableValueNode members functions when possible in the derived valuenodes.

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

diff --git a/synfig-core/src/synfig/valuenode_compare.cpp b/synfig-core/src/synfig/valuenode_compare.cpp
index ba7abe6..c8ed951 100644 (file)
--- a/synfig-core/src/synfig/valuenode_compare.cpp
+++ b/synfig-core/src/synfig/valuenode_compare.cpp
@@ -54,6 +54,8 @@ using namespace synfig;
 ValueNode_Compare::ValueNode_Compare(const ValueBase &x):
        LinkableValueNode(x.get_type())
 {
+       Vocab ret(get_children_vocab());
+       set_children_vocab(ret);
        bool value(x.get(bool()));
 
        set_link("lhs",          ValueNode_Const::create(Real(0)));
@@ -112,50 +114,6 @@ ValueNode_Compare::get_link_vfunc(int i)const
        return 0;
 }
 
-int
-ValueNode_Compare::link_count()const
-{
-       return 5;
-}
-
-String
-ValueNode_Compare::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("LHS");
-       if(i==1) return _("RHS");
-       if(i==2) return _("Greater Than");
-       if(i==3) return _("Equal to");
-       if(i==4) return _("Less Than");
-       return String();
-}
-
-String
-ValueNode_Compare::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "lhs";
-       if(i==1) return "rhs";
-       if(i==2) return "greater";
-       if(i==3) return "equal";
-       if(i==4) return "less";
-       return String();
-}
-
-int
-ValueNode_Compare::get_link_index_from_name(const String &name)const
-{
-       if(name=="lhs")     return 0;
-       if(name=="rhs")     return 1;
-       if(name=="greater") return 2;
-       if(name=="equal")   return 3;
-       if(name=="less")    return 4;
-
-       throw Exception::BadLinkName(name);
-}
-
 ValueBase
 ValueNode_Compare::operator()(Time t)const
 {
@@ -197,8 +155,11 @@ ValueNode_Compare::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Compare::get_param_vocab()const
+ValueNode_Compare::get_children_vocab_vfunc()const
 {
+       if(children_vocab.size())
+               return children_vocab;
+
        LinkableValueNode::Vocab ret;
 
        ret.push_back(ParamDesc(ValueBase(),"lhs")