X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_join.cpp;h=19b49f7aa35504219746c691b4eb6c80b66b193c;hb=2b2950e88fb6c4bfa36ec91eb86de33c6c27fafe;hp=3ce8b178a1fc7ffa3515ee4b13ffe7c1ae7f1e56;hpb=8eed22b9657ac7cb1881eab5c7b5c3d1f0c69468;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_join.cpp b/synfig-core/src/synfig/valuenode_join.cpp
index 3ce8b17..19b49f7 100644
--- a/synfig-core/src/synfig/valuenode_join.cpp
+++ b/synfig-core/src/synfig/valuenode_join.cpp
@@ -55,6 +55,8 @@ using namespace synfig;
 ValueNode_Join::ValueNode_Join(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	switch(value.get_type())
 	{
 	case ValueBase::TYPE_STRING:
@@ -172,53 +174,6 @@ ValueNode_Join::get_link_vfunc(int i)const
 	return 0;
 }
 
-int
-ValueNode_Join::link_count()const
-{
-	return 4;
-}
-
-String
-ValueNode_Join::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return "strings";
-		case 1: return "before";
-		case 2: return "separator";
-		case 3: return "after";
-	}
-	return String();
-}
-
-String
-ValueNode_Join::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return _("Strings");
-		case 1: return _("Before");
-		case 2: return _("Separator");
-		case 3: return _("After");
-	}
-	return String();
-}
-
-int
-ValueNode_Join::get_link_index_from_name(const String &name)const
-{
-	if (name=="strings") return 0;
-	if (name=="before") return 1;
-	if (name=="separator") return 2;
-	if (name=="after") return 3;
-
-	throw Exception::BadLinkName(name);
-}
-
 bool
 ValueNode_Join::check_type(ValueBase::Type type)
 {
@@ -227,8 +182,11 @@ ValueNode_Join::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Join::get_param_vocab()const
+ValueNode_Join::get_children_vocab_vfunc()const
 {
+	if(children_vocab.size())
+		return children_vocab;
+
 	LinkableValueNode::Vocab ret;
 
 	ret.push_back(ParamDesc(ValueBase(),"strings")