X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_and.cpp;h=ada281bf805b22083d78a3f5f41e53bd4264f721;hb=2b2950e88fb6c4bfa36ec91eb86de33c6c27fafe;hp=101b9e8f5501cc33175d3c70f6f01ce544698df0;hpb=8eed22b9657ac7cb1881eab5c7b5c3d1f0c69468;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_and.cpp b/synfig-core/src/synfig/valuenode_and.cpp
index 101b9e8..ada281b 100644
--- a/synfig-core/src/synfig/valuenode_and.cpp
+++ b/synfig-core/src/synfig/valuenode_and.cpp
@@ -54,6 +54,8 @@ using namespace synfig;
 ValueNode_And::ValueNode_And(const ValueBase &x):
 	LinkableValueNode(x.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	bool value(x.get(bool()));
 
 	set_link("link1",        ValueNode_Const::create(bool(true)));
@@ -102,41 +104,6 @@ ValueNode_And::get_link_vfunc(int i)const
 	return 0;
 }
 
-int
-ValueNode_And::link_count()const
-{
-	return 2;
-}
-
-String
-ValueNode_And::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	if(i==0) return _("Link1");
-	if(i==1) return _("Link2");
-	return String();
-}
-
-String
-ValueNode_And::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	if(i==0) return "link1";
-	if(i==1) return "link2";
-	return String();
-}
-
-int
-ValueNode_And::get_link_index_from_name(const String &name)const
-{
-	if(name=="link1")    return 0;
-	if(name=="link2")    return 1;
-
-	throw Exception::BadLinkName(name);
-}
-
 ValueBase
 ValueNode_And::operator()(Time t)const
 {
@@ -168,8 +135,11 @@ ValueNode_And::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_And::get_param_vocab() const
+ValueNode_And::get_children_vocab_vfunc() const
 {
+	if(children_vocab.size())
+		return children_vocab;
+
 	LinkableValueNode::Vocab ret;
 
 	ret.push_back(ParamDesc(ValueBase(),"link1")