X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_integer.cpp;h=38cd08247377ab3a1717b16a4a7ff774741e8ccd;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1040c9a3bafa890afd1ff0f0b86659d9683fc3c9;hpb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_integer.cpp b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
index 1040c9a..38cd082 100644
--- a/synfig-core/trunk/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -75,7 +75,7 @@ ValueNode_Integer::ValueNode_Integer(const ValueBase &x):
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Integer:Bad type "+ValueBase::type_name(x.get_type()));
+		throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(x.get_type()));
 	}
 }
 
@@ -97,19 +97,15 @@ ValueNode_Integer::~ValueNode_Integer()
 }
 
 bool
-ValueNode_Integer::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Integer::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
 
 	switch(i)
 	{
-	case 0:  integer_ = x; break;
-	default: return false;
+	case 0: CHECK_TYPE_AND_SET_VALUE(integer_, get_type());
 	}
-
-	signal_child_changed()(i);
-	signal_value_changed()();
-	return true;
+	return false;
 }
 
 ValueNode::LooseHandle
@@ -157,6 +153,9 @@ ValueNode_Integer::get_link_index_from_name(const String &name)const
 ValueBase
 ValueNode_Integer::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	int integer = (*integer_)(t).get(int());
 
 	switch (get_type())
@@ -171,7 +170,7 @@ ValueNode_Integer::operator()(Time t)const
 		return Time(integer);
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Integer:Bad type "+ValueBase::type_name(get_type()));
+		throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(get_type()));
 	}
 }
 
@@ -189,7 +188,7 @@ ValueNode_Integer::get_local_name()const
 
 // don't show this to the user at the moment - maybe it's not very useful
 bool
-ValueNode_Integer::check_type(ValueBase::Type type)
+ValueNode_Integer::check_type(ValueBase::Type type __attribute__ ((unused)))
 {
 	return false;
 //	return