X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_and.cpp;h=bab34640dff2fb721d22bdda4664e53751f4ca95;hb=cdd545904107accd138c88949f2c253bee0377bb;hp=974485ce369d0e3018a6d2e22cd30a6dcb097982;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_and.cpp b/synfig-core/src/synfig/valuenode_and.cpp
index 974485c..bab3464 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)));
@@ -108,35 +110,6 @@ 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
 {
@@ -166,3 +139,24 @@ ValueNode_And::check_type(ValueBase::Type type)
 {
 	return type==ValueBase::TYPE_BOOL;
 }
+
+LinkableValueNode::Vocab
+ValueNode_And::get_children_vocab_vfunc() const
+{
+	if(children_vocab.size())
+		return children_vocab;
+
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc(ValueBase(),"link1")
+		.set_local_name(_("Link1"))
+		.set_description(_("First operand of the AND operation"))
+	);
+
+	ret.push_back(ParamDesc(ValueBase(),"link2")
+		.set_local_name(_("Link2"))
+		.set_description(_("Second operand of the AND operation"))
+	);
+
+	return ret;
+}