X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_integer.cpp;h=e38625ff36869452468f815879c01ba9876e1bdd;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=e0d5057f44dfe749e9a74373f77d6ed3f0752ce9;hpb=c548bdf3c6b899415810f9f9438fcfd6769b78ce;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_integer.cpp b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
index e0d5057..e38625f 100644
--- a/synfig-core/trunk/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
@@ -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,24 +97,22 @@ 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());
+	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
 ValueNode_Integer::get_link_vfunc(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return integer_;
 
 	return 0;
@@ -129,7 +127,8 @@ ValueNode_Integer::link_count()const
 String
 ValueNode_Integer::link_local_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return _("Integer");
 	return String();
 }
@@ -137,7 +136,8 @@ ValueNode_Integer::link_local_name(int i)const
 String
 ValueNode_Integer::link_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return "integer";
 	return String();
 }
@@ -167,7 +167,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()));
 	}
 }
 
@@ -183,12 +183,14 @@ ValueNode_Integer::get_local_name()const
 	return _("From Integer");
 }
 
+// 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
-		type==ValueBase::TYPE_ANGLE ||
-		type==ValueBase::TYPE_BOOL  ||
-		type==ValueBase::TYPE_REAL  ||
-		type==ValueBase::TYPE_TIME;
+	return false;
+//	return
+//		type==ValueBase::TYPE_ANGLE ||
+//		type==ValueBase::TYPE_BOOL  ||
+//		type==ValueBase::TYPE_REAL  ||
+//		type==ValueBase::TYPE_TIME;
 }