From 27d3ae1a22e9dfdcfff2a77a4a2a3d0d8434e845 Mon Sep 17 00:00:00 2001
From: Carlos Lopez <genetita@gmail.com>
Date: Thu, 16 Dec 2010 22:13:43 +0100
Subject: [PATCH] Use ancestor's link_local_name(int i), link_name(i) and
 get_link_index_from_name(String &name) member functions for some value nodes

---
 synfig-core/src/synfig/valuenode_add.cpp         | 37 ---------------------
 synfig-core/src/synfig/valuenode_add.h           |  3 --
 synfig-core/src/synfig/valuenode_and.cpp         | 29 -----------------
 synfig-core/src/synfig/valuenode_and.h           | 10 ------
 synfig-core/src/synfig/valuenode_anglestring.cpp | 41 ------------------------
 synfig-core/src/synfig/valuenode_anglestring.h   | 10 ------
 6 files changed, 130 deletions(-)

diff --git a/synfig-core/src/synfig/valuenode_add.cpp b/synfig-core/src/synfig/valuenode_add.cpp
index 346357b..a45d2c5 100644
--- a/synfig-core/src/synfig/valuenode_add.cpp
+++ b/synfig-core/src/synfig/valuenode_add.cpp
@@ -182,43 +182,6 @@ ValueNode_Add::link_count()const
 }
 
 String
-ValueNode_Add::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return _("LHS");
-		case 1: return _("RHS");
-		case 2: return _("Scalar");
-		default: return String();
-	}
-}
-
-String
-ValueNode_Add::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return "lhs";
-		case 1: return "rhs";
-		case 2: return "scalar";
-		default: return String();
-	}
-}
-
-int
-ValueNode_Add::get_link_index_from_name(const String &name)const
-{
-	if(name=="lhs") return 0;
-	if(name=="rhs") return 1;
-	if(name=="scalar") return 2;
-	throw Exception::BadLinkName(name);
-}
-
-String
 ValueNode_Add::get_name()const
 {
 	return "add";
diff --git a/synfig-core/src/synfig/valuenode_add.h b/synfig-core/src/synfig/valuenode_add.h
index 7b27e3c..ee0c5cd 100644
--- a/synfig-core/src/synfig/valuenode_add.h
+++ b/synfig-core/src/synfig/valuenode_add.h
@@ -57,9 +57,6 @@ public:
 	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 	virtual int link_count()const;
-	virtual String link_local_name(int i)const;
-	virtual String link_name(int i)const;
-	virtual int get_link_index_from_name(const String &name)const;
 	virtual String get_name()const;
 	virtual String get_local_name()const;
 	static bool check_type(ValueBase::Type type);
diff --git a/synfig-core/src/synfig/valuenode_and.cpp b/synfig-core/src/synfig/valuenode_and.cpp
index 101b9e8..cae2beb 100644
--- a/synfig-core/src/synfig/valuenode_and.cpp
+++ b/synfig-core/src/synfig/valuenode_and.cpp
@@ -108,35 +108,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
 {
diff --git a/synfig-core/src/synfig/valuenode_and.h b/synfig-core/src/synfig/valuenode_and.h
index 9bca6ee..fb09e9a 100644
--- a/synfig-core/src/synfig/valuenode_and.h
+++ b/synfig-core/src/synfig/valuenode_and.h
@@ -46,21 +46,12 @@ public:
 	typedef etl::handle<const ValueNode_And> ConstHandle;
 
 	ValueNode_And(const ValueBase &x);
-
 	virtual ValueBase operator()(Time t)const;
-
 	virtual ~ValueNode_And();
-
 	virtual String get_name()const;
 	virtual String get_local_name()const;
-
-
 	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 	virtual int link_count()const;
-	virtual String link_name(int i)const;
-
-	virtual String link_local_name(int i)const;
-	virtual int get_link_index_from_name(const String &name)const;
 
 protected:
 	LinkableValueNode* create_new()const;
@@ -68,7 +59,6 @@ protected:
 
 public:
 	using synfig::LinkableValueNode::get_link_vfunc;
-
 	using synfig::LinkableValueNode::set_link_vfunc;
 	static bool check_type(ValueBase::Type type);
 	static ValueNode_And* create(const ValueBase &x);
diff --git a/synfig-core/src/synfig/valuenode_anglestring.cpp b/synfig-core/src/synfig/valuenode_anglestring.cpp
index 0be9ff5..f18621b 100644
--- a/synfig-core/src/synfig/valuenode_anglestring.cpp
+++ b/synfig-core/src/synfig/valuenode_anglestring.cpp
@@ -160,47 +160,6 @@ ValueNode_AngleString::link_count()const
 	return 4;
 }
 
-String
-ValueNode_AngleString::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return "angle";
-		case 1: return "width";
-		case 2: return "precision";
-		case 3: return "zero_pad";
-	}
-	return String();
-}
-
-String
-ValueNode_AngleString::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return _("Angle");
-		case 1: return _("Width");
-		case 2: return _("Precision");
-		case 3: return _("Zero Padded");
-	}
-	return String();
-}
-
-int
-ValueNode_AngleString::get_link_index_from_name(const String &name)const
-{
-	if (name=="angle") return 0;
-	if (name=="width") return 1;
-	if (name=="precision") return 2;
-	if (name=="zero_pad") return 3;
-
-	throw Exception::BadLinkName(name);
-}
-
 bool
 ValueNode_AngleString::check_type(ValueBase::Type type)
 {
diff --git a/synfig-core/src/synfig/valuenode_anglestring.h b/synfig-core/src/synfig/valuenode_anglestring.h
index 9faaec1..2051672 100644
--- a/synfig-core/src/synfig/valuenode_anglestring.h
+++ b/synfig-core/src/synfig/valuenode_anglestring.h
@@ -50,21 +50,12 @@ public:
 	typedef etl::handle<ValueNode_AngleString> Handle;
 	typedef etl::handle<const ValueNode_AngleString> ConstHandle;
 
-
 	virtual ValueBase operator()(Time t)const;
-
 	virtual ~ValueNode_AngleString();
-
 	virtual String get_name()const;
 	virtual String get_local_name()const;
-
-
 	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 	virtual int link_count()const;
-	virtual String link_name(int i)const;
-
-	virtual String link_local_name(int i)const;
-	virtual int get_link_index_from_name(const String &name)const;
 
 protected:
 	LinkableValueNode* create_new()const;
@@ -72,7 +63,6 @@ protected:
 
 public:
 	using synfig::LinkableValueNode::get_link_vfunc;
-
 	using synfig::LinkableValueNode::set_link_vfunc;
 	static bool check_type(ValueBase::Type type);
 	static ValueNode_AngleString* create(const ValueBase &x);
-- 
2.7.4