X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_switch.cpp;h=b7aefb6af9fa71eba7672d900a0d90395a42ab6e;hb=729736ee07bfd6c1d6487bc19ac5d10ec72131c8;hp=d55f7df96474e2f4fa7817cc34ba3f61ae7b01db;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_switch.cpp b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
index d55f7df..b7aefb6 100644
--- a/synfig-core/trunk/src/synfig/valuenode_switch.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
@@ -80,35 +80,24 @@ ValueNode_Switch::~ValueNode_Switch()
 }
 
 bool
-ValueNode_Switch::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Switch::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0:
-		if(x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x))
-			return false;
-		link_off_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 1:
-		if(x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x))
-			return false;
-		link_on_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 2:
-		switch_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(link_off_, get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(link_on_,  get_type());
+	case 2: CHECK_TYPE_AND_SET_VALUE(switch_,   ValueBase::TYPE_BOOL);
 	}
-	return true;
+	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Switch::get_link_vfunc(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return link_off_;
@@ -128,6 +117,7 @@ String
 ValueNode_Switch::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return "link_off";
@@ -141,6 +131,7 @@ String
 ValueNode_Switch::link_local_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return "Link Off";