Use LinkableValueNode members functions when possible in the derived valuenodes.

diff --git a/synfig-core/src/modules/mod_noise/valuenode_random.cpp b/synfig-core/src/modules/mod_noise/valuenode_random.cpp
index 1aeb325..093f25c 100644 (file)
--- a/synfig-core/src/modules/mod_noise/valuenode_random.cpp
+++ b/synfig-core/src/modules/mod_noise/valuenode_random.cpp
@@ -216,58 +216,6 @@ ValueNode_Random::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Random::link_count()const
-{
-       return 6;
-}
-
-String
-ValueNode_Random::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "link";
-       case 1: return "radius";
-       case 2: return "seed";
-       case 3: return "speed";
-       case 4: return "smooth";
-       case 5: return "loop";
-       }
-       return String();
-}
-
-String
-ValueNode_Random::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return _("Link");
-       case 1: return _("Radius");
-       case 2: return _("Seed");
-       case 3: return _("Animation Speed");
-       case 4: return _("Interpolation");
-       case 5: return _("Loop Time");
-       }
-       return String();
-}
-
-int
-ValueNode_Random::get_link_index_from_name(const String &name)const
-{
-       if(name=="link"  ) return 0;
-       if(name=="radius") return 1;
-       if(name=="seed"  ) return 2;
-       if(name=="speed" ) return 3;
-       if(name=="smooth") return 4;
-       if(name=="loop"  ) return 5;
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_Random::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_Random::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/modules/mod_noise/valuenode_random.h b/synfig-core/src/modules/mod_noise/valuenode_random.h
index 021c0cc..01baadc 100644 (file)
--- a/synfig-core/src/modules/mod_noise/valuenode_random.h
+++ b/synfig-core/src/modules/mod_noise/valuenode_random.h
@@ -63,11 +63,6 @@ public:
        virtual String get_local_name()const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;

 
        virtual ValueNode* clone(const GUID& deriv_guid=GUID())const;
 
 
        virtual ValueNode* clone(const GUID& deriv_guid=GUID())const;
 

diff --git a/synfig-core/src/synfig/valuenode_add.cpp b/synfig-core/src/synfig/valuenode_add.cpp
index 87ab7e3..daeb390 100644 (file)
--- a/synfig-core/src/synfig/valuenode_add.cpp
+++ b/synfig-core/src/synfig/valuenode_add.cpp
@@ -177,12 +177,6 @@ ValueNode_Add::get_link_vfunc(int i)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Add::link_count()const
-{
-       return 3;
-}
-

 String
 ValueNode_Add::get_name()const
 {
 String
 ValueNode_Add::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_add.h b/synfig-core/src/synfig/valuenode_add.h
index 19fa300..680e2cc 100644 (file)
--- a/synfig-core/src/synfig/valuenode_add.h
+++ b/synfig-core/src/synfig/valuenode_add.h
@@ -56,7 +56,6 @@ public:
        virtual ValueBase operator()(Time t)const;
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        virtual ValueBase operator()(Time t)const;
        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 get_name()const;
        virtual String get_local_name()const;
        static bool check_type(ValueBase::Type type);
        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 bab3464..ada281b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_and.cpp
+++ b/synfig-core/src/synfig/valuenode_and.cpp
@@ -104,12 +104,6 @@ ValueNode_And::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_And::link_count()const
-{
-       return 2;
-}
-

 ValueBase
 ValueNode_And::operator()(Time t)const
 {
 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 f80d408..4f704e3 100644 (file)
--- a/synfig-core/src/synfig/valuenode_and.h
+++ b/synfig-core/src/synfig/valuenode_and.h
@@ -51,7 +51,6 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        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;

 
 protected:
        LinkableValueNode* create_new()const;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_anglestring.cpp b/synfig-core/src/synfig/valuenode_anglestring.cpp
index 4177777..8440dea 100644 (file)
--- a/synfig-core/src/synfig/valuenode_anglestring.cpp
+++ b/synfig-core/src/synfig/valuenode_anglestring.cpp
@@ -156,12 +156,6 @@ ValueNode_AngleString::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_AngleString::link_count()const
-{
-       return 4;
-}
-

 bool
 ValueNode_AngleString::check_type(ValueBase::Type type)
 {
 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 30fa303..6a606d7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_anglestring.h
+++ b/synfig-core/src/synfig/valuenode_anglestring.h
@@ -55,7 +55,6 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        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;

 
 protected:
        LinkableValueNode* create_new()const;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_atan2.cpp b/synfig-core/src/synfig/valuenode_atan2.cpp
index ff1fb18..7ff091c 100644 (file)
--- a/synfig-core/src/synfig/valuenode_atan2.cpp
+++ b/synfig-core/src/synfig/valuenode_atan2.cpp
@@ -138,47 +138,6 @@ ValueNode_Atan2::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Atan2::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Atan2::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "x";
-       if(i==1)
-               return "y";
-       return String();
-}
-
-String
-ValueNode_Atan2::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("X");
-       if(i==1)
-               return _("Y");
-       return String();
-}
-
-int
-ValueNode_Atan2::get_link_index_from_name(const String &name)const
-{
-       if(name=="x")
-               return 0;
-       if(name=="y")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode::Vocab
 ValueNode_Atan2::get_children_vocab_vfunc()const
 {
 LinkableValueNode::Vocab
 ValueNode_Atan2::get_children_vocab_vfunc()const
 {

diff --git a/synfig-core/src/synfig/valuenode_atan2.h b/synfig-core/src/synfig/valuenode_atan2.h
index 845883c..4b625e5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_atan2.h
+++ b/synfig-core/src/synfig/valuenode_atan2.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_blinecalctangent.cpp b/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
index 04278b8..e6d67f5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
@@ -212,58 +212,6 @@ ValueNode_BLineCalcTangent::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_BLineCalcTangent::link_count()const
-{
-       return 6;
-}
-
-String
-ValueNode_BLineCalcTangent::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "bline";
-               case 1: return "loop";
-               case 2: return "amount";
-               case 3: return "offset";
-               case 4: return "scale";
-               case 5: return "fixed_length";
-       }
-       return String();
-}
-
-String
-ValueNode_BLineCalcTangent::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("BLine");
-               case 1: return _("Loop");
-               case 2: return _("Amount");
-               case 3: return _("Offset");
-               case 4: return _("Scale");
-               case 5: return _("Fixed Length");
-       }
-       return String();
-}
-
-int
-ValueNode_BLineCalcTangent::get_link_index_from_name(const String &name)const
-{
-       if (name=="bline")                return 0;
-       if (name=="loop")                 return 1;
-       if (name=="amount")               return 2;
-       if (name=="offset")               return 3;
-       if (name=="scale")                return 4;
-       if (name=="fixed_length") return 5;
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_BLineCalcTangent::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_BLineCalcTangent::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_blinecalctangent.h b/synfig-core/src/synfig/valuenode_blinecalctangent.h
index 9952cbe..944769b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalctangent.h
+++ b/synfig-core/src/synfig/valuenode_blinecalctangent.h
@@ -61,11 +61,6 @@ public:
        virtual String get_local_name()const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 
 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);

diff --git a/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp b/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
index 5f2fde6..afdf62e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
@@ -174,49 +174,6 @@ ValueNode_BLineCalcVertex::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_BLineCalcVertex::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_BLineCalcVertex::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "bline";
-               case 1: return "loop";
-               case 2: return "amount";
-       }
-       return String();
-}
-
-String
-ValueNode_BLineCalcVertex::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("BLine");
-               case 1: return _("Loop");
-               case 2: return _("Amount");
-       }
-       return String();
-}
-
-int
-ValueNode_BLineCalcVertex::get_link_index_from_name(const String &name)const
-{
-       if(name=="bline")  return 0;
-       if(name=="loop")   return 1;
-       if(name=="amount") return 2;
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_BLineCalcVertex::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_BLineCalcVertex::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_blinecalcvertex.h b/synfig-core/src/synfig/valuenode_blinecalcvertex.h
index fc95a7d..556f44e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcvertex.h
+++ b/synfig-core/src/synfig/valuenode_blinecalcvertex.h
@@ -56,11 +56,6 @@ public:
        virtual String get_local_name()const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
index d7db04e..9bd5947 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
@@ -179,52 +179,6 @@ ValueNode_BLineCalcWidth::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_BLineCalcWidth::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_BLineCalcWidth::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "bline";
-               case 1: return "loop";
-               case 2: return "amount";
-               case 3: return "scale";
-       }
-       return String();
-}
-
-String
-ValueNode_BLineCalcWidth::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("BLine");
-               case 1: return _("Loop");
-               case 2: return _("Amount");
-               case 3: return _("Scale");
-       }
-       return String();
-}
-
-int
-ValueNode_BLineCalcWidth::get_link_index_from_name(const String &name)const
-{
-       if(name=="bline")  return 0;
-       if(name=="loop")   return 1;
-       if(name=="amount") return 2;
-       if(name=="scale")  return 3;
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_BLineCalcWidth::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_BLineCalcWidth::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_blinecalcwidth.h b/synfig-core/src/synfig/valuenode_blinecalcwidth.h
index c1ef188..117c6c4 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcwidth.h
+++ b/synfig-core/src/synfig/valuenode_blinecalcwidth.h
@@ -59,11 +59,6 @@ public:
        virtual String get_local_name()const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_blinereversetangent.cpp b/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
index 922d9a3..00fc84f 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
+++ b/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
@@ -157,46 +157,6 @@ ValueNode_BLineRevTangent::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_BLineRevTangent::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_BLineRevTangent::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "reference";
-               case 1: return "reverse";
-       }
-       return String();
-}
-
-String
-ValueNode_BLineRevTangent::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Reference");
-               case 1: return _("Reverse");
-       }
-       return String();
-}
-
-int
-ValueNode_BLineRevTangent::get_link_index_from_name(const String &name)const
-{
-       if(name=="reference")   return 0;
-       if(name=="reverse")             return 1;
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_BLineRevTangent::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_BLineRevTangent::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_blinereversetangent.h b/synfig-core/src/synfig/valuenode_blinereversetangent.h
index a0d1b63..aea11ec 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinereversetangent.h
+++ b/synfig-core/src/synfig/valuenode_blinereversetangent.h
@@ -57,11 +57,6 @@ public:
        virtual String get_local_name()const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 
 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);

diff --git a/synfig-core/src/synfig/valuenode_compare.cpp b/synfig-core/src/synfig/valuenode_compare.cpp
index 627d843..c8ed951 100644 (file)
--- a/synfig-core/src/synfig/valuenode_compare.cpp
+++ b/synfig-core/src/synfig/valuenode_compare.cpp
@@ -114,50 +114,6 @@ ValueNode_Compare::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Compare::link_count()const
-{
-       return 5;
-}
-
-String
-ValueNode_Compare::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("LHS");
-       if(i==1) return _("RHS");
-       if(i==2) return _("Greater Than");
-       if(i==3) return _("Equal to");
-       if(i==4) return _("Less Than");
-       return String();
-}
-
-String
-ValueNode_Compare::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "lhs";
-       if(i==1) return "rhs";
-       if(i==2) return "greater";
-       if(i==3) return "equal";
-       if(i==4) return "less";
-       return String();
-}
-
-int
-ValueNode_Compare::get_link_index_from_name(const String &name)const
-{
-       if(name=="lhs")     return 0;
-       if(name=="rhs")     return 1;
-       if(name=="greater") return 2;
-       if(name=="equal")   return 3;
-       if(name=="less")    return 4;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Compare::operator()(Time t)const
 {
 ValueBase
 ValueNode_Compare::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_compare.h b/synfig-core/src/synfig/valuenode_compare.h
index a7de9e4..e575725 100644 (file)
--- a/synfig-core/src/synfig/valuenode_compare.h
+++ b/synfig-core/src/synfig/valuenode_compare.h
@@ -60,11 +60,6 @@ public:
 
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_composite.cpp b/synfig-core/src/synfig/valuenode_composite.cpp
index 342f8ab..cf9c3be 100644 (file)
--- a/synfig-core/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/src/synfig/valuenode_composite.cpp
@@ -170,25 +170,6 @@ synfig::ValueNode_Composite::operator()(Time t)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Composite::link_count()const
-{
-       switch(get_type())
-       {
-       case ValueBase::TYPE_VECTOR:
-               return 2;
-       case ValueBase::TYPE_COLOR:
-               return 4;
-       case ValueBase::TYPE_SEGMENT:
-               return 4;
-       case ValueBase::TYPE_BLINEPOINT:
-               return 6;
-       default:
-               synfig::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
-               return 1;
-       }
-}
-

 bool
 ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 {
 bool
 ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 {


@@ -259,60 +240,6 @@ ValueNode_Composite::get_link_vfunc(int i)const
 }
 
 String
 }
 
 String

-ValueNode_Composite::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(get_type())
-       {
-               case ValueBase::TYPE_VECTOR:
-                       return strprintf("%c-Axis",'X'+i);
-
-               case ValueBase::TYPE_COLOR:
-                       if(i==0)
-                               return _("Red");
-                       else if(i==1)
-                               return _("Green");
-                       else if(i==2)
-                               return _("Blue");
-                       else if(i==3)
-                               return _("Alpha");
-
-               case ValueBase::TYPE_SEGMENT:
-                       if(i==0)
-                               return _("Vertex 1");
-                       else if(i==1)
-                               return _("Tangent 1");
-                       else if(i==2)
-                               return _("Vertex 2");
-                       else if(i==3)
-                               return _("Tangent 2");
-
-               case ValueBase::TYPE_BLINEPOINT:
-                       if(i==0)
-                               return _("Vertex");
-                       else if(i==1)
-                               return _("Width");
-                       else if(i==2)
-                               return _("Origin");
-                       else if(i==3)
-                               return _("Split Tangents");
-                       else if(i==4)
-                               return _("Tangent 1");
-                       else if(i==5)
-                               return _("Tangent 2");
-
-               default:
-                       assert(0);
-                       // notice that Composite counts from 1 and Radial Composite counts
-                       // from 0!  we need to keep it like that to correctly load old
-                       // animations, but let's not save "c%d" format link names in future
-                       return etl::strprintf(_("C%d"),i+1);
-       }
-}
-
-
-String

 ValueNode_Composite::link_name(int i)const
 {
        assert(i>=0 && i<link_count());
 ValueNode_Composite::link_name(int i)const
 {
        assert(i>=0 && i<link_count());


@@ -320,58 +247,15 @@ ValueNode_Composite::link_name(int i)const
        if (get_file_version() < RELEASE_VERSION_0_61_08)
                return strprintf("c%d",i+1);
 
        if (get_file_version() < RELEASE_VERSION_0_61_08)
                return strprintf("c%d",i+1);
 

-       switch(get_type())
-       {
-       case ValueBase::TYPE_COLOR:
-               switch(i)
-               {
-               case 0: return "red";
-               case 1: return "green";
-               case 2: return "blue";
-               case 3: return "alpha";
-               }
-               break;
-       case ValueBase::TYPE_SEGMENT:
-               switch(i)
-               {
-               case 0: return "p1";
-               case 1: return "t1";
-               case 2: return "p2";
-               case 3: return "t2";
-               }
-               break;
-       case ValueBase::TYPE_VECTOR:
-               switch(i)
-               {
-               case 0: return "x";
-               case 1: return "y";
-               }
-               break;
-       case ValueBase::TYPE_BLINEPOINT:
-               switch(i)
-               {
-               case 0: return "point";
-               case 1: return "width";
-               case 2: return "origin";
-               case 3: return "split";
-               case 4: return "t1";
-               case 5: return "t2";
-               }
-               break;
-       default:
-               break;
-       }
-
-       assert(0);
-       // notice that Composite counts from 1 and Radial Composite counts
-       // from 0!  we need to keep it like that to correctly load old
-       // animations, but let's not save "c%d" format link names in future
-       return strprintf("c%d",i+1);
+       return LinkableValueNode::link_name(i);

 }
 
 int
 ValueNode_Composite::get_link_index_from_name(const String &name)const
 {
 }
 
 int
 ValueNode_Composite::get_link_index_from_name(const String &name)const
 {

+       // Here we don't use the LinkableValueNode::get_link_index_from_name
+       // due to the particularities of the link index from name for old files.
+       // So we keep this alive to maintain old file compatibilities.

        if(name.empty())
                throw Exception::BadLinkName(name);
 
        if(name.empty())
                throw Exception::BadLinkName(name);
 

diff --git a/synfig-core/src/synfig/valuenode_composite.h b/synfig-core/src/synfig/valuenode_composite.h
index c684aa8..8870de5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_composite.h
+++ b/synfig-core/src/synfig/valuenode_composite.h
@@ -48,12 +48,8 @@ public:
        ~ValueNode_Composite();
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        ~ValueNode_Composite();
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;

-       virtual int link_count()const;

        virtual String link_name(int i)const;
        virtual String link_name(int i)const;

-       virtual String link_local_name(int i)const;

        virtual ValueBase operator()(Time t)const;
        virtual ValueBase operator()(Time t)const;

-
-

        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual int get_link_index_from_name(const String &name)const;
        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual int get_link_index_from_name(const String &name)const;

diff --git a/synfig-core/src/synfig/valuenode_cos.cpp b/synfig-core/src/synfig/valuenode_cos.cpp
index 2eef6cd..f1ada07 100644 (file)
--- a/synfig-core/src/synfig/valuenode_cos.cpp
+++ b/synfig-core/src/synfig/valuenode_cos.cpp
@@ -142,49 +142,6 @@ ValueNode_Cos::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Cos::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Cos::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "angle";
-       case 1: return "amp";
-       }
-
-       return String();
-}
-
-String
-ValueNode_Cos::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return _("Angle");
-       case 1: return _("Amplitude");
-       }
-
-       return String();
-}
-
-int
-ValueNode_Cos::get_link_index_from_name(const String &name)const
-{
-       if(name=="angle")       return 0;
-       if(name=="amp")         return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode::Vocab
 ValueNode_Cos::get_children_vocab_vfunc()const
 {
 LinkableValueNode::Vocab
 ValueNode_Cos::get_children_vocab_vfunc()const
 {

diff --git a/synfig-core/src/synfig/valuenode_cos.h b/synfig-core/src/synfig/valuenode_cos.h
index b835f31..1b9c94e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_cos.h
+++ b/synfig-core/src/synfig/valuenode_cos.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_dotproduct.cpp b/synfig-core/src/synfig/valuenode_dotproduct.cpp
index f478d01..cc81dbd 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dotproduct.cpp
+++ b/synfig-core/src/synfig/valuenode_dotproduct.cpp
@@ -149,47 +149,6 @@ ValueNode_DotProduct::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_DotProduct::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_DotProduct::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "lhs";
-               case 1: return "rhs";
-       }
-       return String();
-}
-
-String
-ValueNode_DotProduct::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("LHS");
-               case 1: return _("RHS");
-       }
-       return String();
-}
-
-int
-ValueNode_DotProduct::get_link_index_from_name(const String &name)const
-{
-       if (name=="lhs") return 0;
-       if (name=="rhs") return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_DotProduct::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_DotProduct::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_dotproduct.h b/synfig-core/src/synfig/valuenode_dotproduct.h
index 0a6e63a..bebb2fe 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dotproduct.h
+++ b/synfig-core/src/synfig/valuenode_dotproduct.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_duplicate.cpp b/synfig-core/src/synfig/valuenode_duplicate.cpp
index b3e88aa..98921a7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_duplicate.cpp
+++ b/synfig-core/src/synfig/valuenode_duplicate.cpp
@@ -109,44 +109,6 @@ ValueNode_Duplicate::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Duplicate::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Duplicate::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("From");
-       if(i==1) return _("To");
-       if(i==2) return _("Step");
-       return String();
-}
-
-String
-ValueNode_Duplicate::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "from";
-       if(i==1) return "to";
-       if(i==2) return "step";
-       return String();
-}
-
-int
-ValueNode_Duplicate::get_link_index_from_name(const String &name)const
-{
-       if(name=="from") return 0;
-       if(name=="to")   return 1;
-       if(name=="step") return 2;
-
-       throw Exception::BadLinkName(name);
-}
-

 void
 ValueNode_Duplicate::reset_index(Time t)const
 {
 void
 ValueNode_Duplicate::reset_index(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_duplicate.h b/synfig-core/src/synfig/valuenode_duplicate.h
index d9b2f63..8688582 100644 (file)
--- a/synfig-core/src/synfig/valuenode_duplicate.h
+++ b/synfig-core/src/synfig/valuenode_duplicate.h
@@ -60,13 +60,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_exp.cpp b/synfig-core/src/synfig/valuenode_exp.cpp
index 200d438..154e166 100644 (file)
--- a/synfig-core/src/synfig/valuenode_exp.cpp
+++ b/synfig-core/src/synfig/valuenode_exp.cpp
@@ -131,47 +131,6 @@ ValueNode_Exp::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Exp::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Exp::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "exp";
-       if(i==1)
-               return "scale";
-       return String();
-}
-
-String
-ValueNode_Exp::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Exponent");
-       if(i==1)
-               return _("Scale");
-       return String();
-}
-
-int
-ValueNode_Exp::get_link_index_from_name(const String &name)const
-{
-       if(name=="exp")
-               return 0;
-       if(name=="scale")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_Exp::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_Exp::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_exp.h b/synfig-core/src/synfig/valuenode_exp.h
index 8d835fc..9152364 100644 (file)
--- a/synfig-core/src/synfig/valuenode_exp.h
+++ b/synfig-core/src/synfig/valuenode_exp.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_gradientcolor.cpp b/synfig-core/src/synfig/valuenode_gradientcolor.cpp
index bfbda7d..13cc831 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientcolor.cpp
+++ b/synfig-core/src/synfig/valuenode_gradientcolor.cpp
@@ -127,49 +127,6 @@ ValueNode_GradientColor::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_GradientColor::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_GradientColor::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Gradient");
-               case 1: return _("Index");
-               case 2: return _("Loop");
-       }
-       return String();
-}
-
-String
-ValueNode_GradientColor::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "gradient";
-               case 1: return "index";
-               case 2: return "loop";
-       }
-       return String();
-}
-
-int
-ValueNode_GradientColor::get_link_index_from_name(const String &name)const
-{
-       if (name=="gradient") return 0;
-       if (name=="index")        return 1;
-       if (name=="loop")         return 2;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_GradientColor::get_name()const
 {
 String
 ValueNode_GradientColor::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_gradientcolor.h b/synfig-core/src/synfig/valuenode_gradientcolor.h
index 3bf2e3b..02789a7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientcolor.h
+++ b/synfig-core/src/synfig/valuenode_gradientcolor.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_gradientrotate.cpp b/synfig-core/src/synfig/valuenode_gradientrotate.cpp
index 709a99a..97cc9eb 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientrotate.cpp
+++ b/synfig-core/src/synfig/valuenode_gradientrotate.cpp
@@ -133,53 +133,6 @@ ValueNode_GradientRotate::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_GradientRotate::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_GradientRotate::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return _("Gradient");
-               case 1:
-                       return _("Offset");
-               default:
-                       return String();
-       }
-}
-
-String
-ValueNode_GradientRotate::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return "gradient";
-               case 1:
-                       return "offset";
-               default: return String();
-       }
-}
-
-int
-ValueNode_GradientRotate::get_link_index_from_name(const String &name)const
-{
-       if(name=="gradient")
-               return 0;
-       if(name=="offset")
-               return 1;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_GradientRotate::get_name()const
 {
 String
 ValueNode_GradientRotate::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_gradientrotate.h b/synfig-core/src/synfig/valuenode_gradientrotate.h
index fca157a..04866f9 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientrotate.h
+++ b/synfig-core/src/synfig/valuenode_gradientrotate.h
@@ -54,18 +54,8 @@ public:
 
        virtual ~ValueNode_GradientRotate();
 
 
        virtual ~ValueNode_GradientRotate();
 

-//     static Handle create(ValueBase::Type id=ValueBase::TYPE_GRADIENT);
-
-
-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
        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 ValueBase operator()(Time t)const;
 
        virtual String get_name()const;
        virtual ValueBase operator()(Time t)const;
 
        virtual String get_name()const;

diff --git a/synfig-core/src/synfig/valuenode_integer.cpp b/synfig-core/src/synfig/valuenode_integer.cpp
index 8b44504..0b46447 100644 (file)
--- a/synfig-core/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/src/synfig/valuenode_integer.cpp
@@ -120,38 +120,6 @@ ValueNode_Integer::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Integer::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_Integer::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Integer");
-       return String();
-}
-
-String
-ValueNode_Integer::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "integer";
-       return String();
-}
-
-int
-ValueNode_Integer::get_link_index_from_name(const String &name)const
-{
-       if(name=="integer") return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Integer::operator()(Time t)const
 {
 ValueBase
 ValueNode_Integer::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_integer.h b/synfig-core/src/synfig/valuenode_integer.h
index 1ed99d8..f3bdf2a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_integer.h
+++ b/synfig-core/src/synfig/valuenode_integer.h
@@ -54,13 +54,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_intstring.cpp b/synfig-core/src/synfig/valuenode_intstring.cpp
index e29199d..e9c86e7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_intstring.cpp
+++ b/synfig-core/src/synfig/valuenode_intstring.cpp
@@ -150,50 +150,6 @@ ValueNode_IntString::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_IntString::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_IntString::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "int";
-               case 1: return "width";
-               case 2: return "zero_pad";
-       }
-       return String();
-}
-
-String
-ValueNode_IntString::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Int");
-               case 1: return _("Width");
-               case 2: return _("Zero Padded");
-       }
-       return String();
-}
-
-int
-ValueNode_IntString::get_link_index_from_name(const String &name)const
-{
-       if (name=="int") return 0;
-       if (name=="width") return 1;
-       if (name=="zero_pad") return 2;
-
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_IntString::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_IntString::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_intstring.h b/synfig-core/src/synfig/valuenode_intstring.h
index c19f7c5..5fec136 100644 (file)
--- a/synfig-core/src/synfig/valuenode_intstring.h
+++ b/synfig-core/src/synfig/valuenode_intstring.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_join.cpp b/synfig-core/src/synfig/valuenode_join.cpp
index 98edb47..19b49f7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_join.cpp
+++ b/synfig-core/src/synfig/valuenode_join.cpp
@@ -174,53 +174,6 @@ ValueNode_Join::get_link_vfunc(int i)const
        return 0;
 }
 
        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)
 {
 bool
 ValueNode_Join::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_join.h b/synfig-core/src/synfig/valuenode_join.h
index e13f951..c6d84e0 100644 (file)
--- a/synfig-core/src/synfig/valuenode_join.h
+++ b/synfig-core/src/synfig/valuenode_join.h
@@ -58,13 +58,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_linear.cpp b/synfig-core/src/synfig/valuenode_linear.cpp
index cc716a8..ce6c5df 100644 (file)
--- a/synfig-core/src/synfig/valuenode_linear.cpp
+++ b/synfig-core/src/synfig/valuenode_linear.cpp
@@ -180,55 +180,6 @@ ValueNode_Linear::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Linear::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Linear::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "slope";
-       if(i==1) return "offset";
-       return String();
-}
-
-String
-ValueNode_Linear::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               switch(get_type())
-               {
-               case ValueBase::TYPE_ANGLE:
-               case ValueBase::TYPE_COLOR:
-               case ValueBase::TYPE_INTEGER:
-               case ValueBase::TYPE_REAL:
-               case ValueBase::TYPE_TIME:
-                       return _("Rate");
-               case ValueBase::TYPE_VECTOR:
-               default:
-                       return _("Slope");
-               }
-       if(i==1)
-               return _("Offset");
-       return String();
-}
-
-int
-ValueNode_Linear::get_link_index_from_name(const String &name)const
-{
-       if(name=="slope")  return 0;
-       if(name=="offset") return 1;
-
-       throw Exception::BadLinkName(name);
-}
-
-

 LinkableValueNode::Vocab
 ValueNode_Linear::get_children_vocab_vfunc()const
 {
 LinkableValueNode::Vocab
 ValueNode_Linear::get_children_vocab_vfunc()const
 {

diff --git a/synfig-core/src/synfig/valuenode_linear.h b/synfig-core/src/synfig/valuenode_linear.h
index 35c53bb..7a84479 100644 (file)
--- a/synfig-core/src/synfig/valuenode_linear.h
+++ b/synfig-core/src/synfig/valuenode_linear.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_log.cpp b/synfig-core/src/synfig/valuenode_log.cpp
index 7973a34..ad26111 100644 (file)
--- a/synfig-core/src/synfig/valuenode_log.cpp
+++ b/synfig-core/src/synfig/valuenode_log.cpp
@@ -110,44 +110,6 @@ ValueNode_Logarithm::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Logarithm::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Logarithm::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Link");
-       if(i==1) return _("Epsilon");
-       if(i==2) return _("Infinite");
-       return String();
-}
-
-String
-ValueNode_Logarithm::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "link";
-       if(i==1) return "epsilon";
-       if(i==2) return "infinite";
-       return String();
-}
-
-int
-ValueNode_Logarithm::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")     return 0;
-       if(name=="epsilon")  return 1;
-       if(name=="infinite") return 2;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Logarithm::operator()(Time t)const
 {
 ValueBase
 ValueNode_Logarithm::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_log.h b/synfig-core/src/synfig/valuenode_log.h
index 2448925..6b0be22 100644 (file)
--- a/synfig-core/src/synfig/valuenode_log.h
+++ b/synfig-core/src/synfig/valuenode_log.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_not.cpp b/synfig-core/src/synfig/valuenode_not.cpp
index 9e835c0..fe5ae12 100644 (file)
--- a/synfig-core/src/synfig/valuenode_not.cpp
+++ b/synfig-core/src/synfig/valuenode_not.cpp
@@ -99,38 +99,6 @@ ValueNode_Not::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Not::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_Not::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Link");
-       return String();
-}
-
-String
-ValueNode_Not::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "link";
-       return String();
-}
-
-int
-ValueNode_Not::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")     return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Not::operator()(Time t)const
 {
 ValueBase
 ValueNode_Not::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_not.h b/synfig-core/src/synfig/valuenode_not.h
index 5051f57..17d260f 100644 (file)
--- a/synfig-core/src/synfig/valuenode_not.h
+++ b/synfig-core/src/synfig/valuenode_not.h
@@ -53,13 +53,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_or.cpp b/synfig-core/src/synfig/valuenode_or.cpp
index 4cfff5c..6e56ca8 100644 (file)
--- a/synfig-core/src/synfig/valuenode_or.cpp
+++ b/synfig-core/src/synfig/valuenode_or.cpp
@@ -104,41 +104,6 @@ ValueNode_Or::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Or::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Or::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_Or::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_Or::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_Or::operator()(Time t)const
 {
 ValueBase
 ValueNode_Or::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_or.h b/synfig-core/src/synfig/valuenode_or.h
index f954964..d92adc9 100644 (file)
--- a/synfig-core/src/synfig/valuenode_or.h
+++ b/synfig-core/src/synfig/valuenode_or.h
@@ -54,13 +54,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_pow.cpp b/synfig-core/src/synfig/valuenode_pow.cpp
index 94369bf..0072d19 100644 (file)
--- a/synfig-core/src/synfig/valuenode_pow.cpp
+++ b/synfig-core/src/synfig/valuenode_pow.cpp
@@ -110,47 +110,6 @@ ValueNode_Pow::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Pow::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_Pow::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Base");
-       if(i==1) return _("Power");
-       if(i==2) return _("Epsilon");
-       if(i==3) return _("Infinite");
-       return String();
-}
-
-String
-ValueNode_Pow::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "base";
-       if(i==1) return "power";
-       if(i==2) return "epsilon";
-       if(i==3) return "infinite";
-       return String();
-}
-
-int
-ValueNode_Pow::get_link_index_from_name(const String &name)const
-{
-       if(name=="base")     return 0;
-       if(name=="power")    return 1;
-       if(name=="epsilon")  return 2;
-       if(name=="infinite") return 3;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Pow::operator()(Time t)const
 {
 ValueBase
 ValueNode_Pow::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_pow.h b/synfig-core/src/synfig/valuenode_pow.h
index 6cd7255..e476303 100644 (file)
--- a/synfig-core/src/synfig/valuenode_pow.h
+++ b/synfig-core/src/synfig/valuenode_pow.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
index 85b882a..801c624 100644 (file)
--- a/synfig-core/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
@@ -129,21 +129,6 @@ synfig::ValueNode_RadialComposite::operator()(Time t)const
        }
 }
 
        }
 }
 

-int
-ValueNode_RadialComposite::link_count()const
-{
-       switch(get_type())
-       {
-       case ValueBase::TYPE_VECTOR:
-               return 2;
-       case ValueBase::TYPE_COLOR:
-               return 4;
-       default:
-               synfig::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
-               return 1;
-       }
-}
-

 bool
 ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {
 bool
 ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {


@@ -191,43 +176,6 @@ ValueNode_RadialComposite::get_link_vfunc(int i)const
 }
 
 String
 }
 
 String

-ValueNode_RadialComposite::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(get_type())
-       {
-               case ValueBase::TYPE_VECTOR:
-                       if(i==0)
-                               return _("Radius");
-                       else if(i==1)
-                               return _("Theta");
-                       break;
-
-               case ValueBase::TYPE_COLOR:
-                       if(i==0)
-                               return _("Luma");
-                       else if(i==1)
-                               return _("Saturation");
-                       else if(i==2)
-                               return _("Hue");
-                       else if(i==3)
-                               return _("Alpha");
-                       break;
-
-               default:
-                       break;
-       }
-
-       assert(0);
-       // notice that Composite counts from 1 and Radial Composite counts
-       // from 0!  we need to keep it like that to correctly load old
-       // animations, but let's not save "c%d" format link names in future
-       return etl::strprintf(_("C%d"),i);
-}
-
-
-String

 ValueNode_RadialComposite::link_name(int i)const
 {
        assert(i>=0 && i<link_count());
 ValueNode_RadialComposite::link_name(int i)const
 {
        assert(i>=0 && i<link_count());


@@ -235,38 +183,15 @@ ValueNode_RadialComposite::link_name(int i)const
        if (get_file_version() < RELEASE_VERSION_0_61_08)
                return strprintf("c%d",i);
 
        if (get_file_version() < RELEASE_VERSION_0_61_08)
                return strprintf("c%d",i);
 

-       switch(get_type())
-       {
-       case ValueBase::TYPE_COLOR:
-               switch(i)
-               {
-               case 0: return "y_luma"; // the 'luma' attribute is recognised by the fact that it starts with a 'y'
-               case 1: return "saturation";
-               case 2: return "hue";
-               case 3: return "alpha";
-               }
-               break;
-       case ValueBase::TYPE_VECTOR:
-               switch(i)
-               {
-               case 0: return "radius";
-               case 1: return "theta";
-               }
-               break;
-       default:
-               break;
-       }
-
-       assert(0);
-       // notice that Composite counts from 1 and Radial Composite counts
-       // from 0!  we need to keep it like that to correctly load old
-       // animations, but let's not save "c%d" format link names in future
-       return strprintf("c%d",i);
+       return LinkableValueNode::link_name(i);

 }
 
 int
 ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 {
 }
 
 int
 ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 {

+       // Here we don't use the LinkableValueNode::get_link_index_from_name
+       // due to the particularities of the link index from name for old files.
+       // So we keep this alive to maintain old file compatibilities.

        if(name.empty())
                throw Exception::BadLinkName(name);
 
        if(name.empty())
                throw Exception::BadLinkName(name);
 

diff --git a/synfig-core/src/synfig/valuenode_radialcomposite.h b/synfig-core/src/synfig/valuenode_radialcomposite.h
index 5a412e6..170c2c9 100644 (file)
--- a/synfig-core/src/synfig/valuenode_radialcomposite.h
+++ b/synfig-core/src/synfig/valuenode_radialcomposite.h
@@ -44,16 +44,11 @@ public:
        typedef etl::handle<ValueNode_RadialComposite> Handle;
        typedef etl::handle<const ValueNode_RadialComposite> ConstHandle;
 
        typedef etl::handle<ValueNode_RadialComposite> Handle;
        typedef etl::handle<const ValueNode_RadialComposite> ConstHandle;
 

-

        virtual ~ValueNode_RadialComposite();
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        virtual ~ValueNode_RadialComposite();
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;

-       virtual int link_count()const;

        virtual String link_name(int i)const;
        virtual String link_name(int i)const;

-       virtual String link_local_name(int i)const;

        virtual ValueBase operator()(Time t)const;
        virtual ValueBase operator()(Time t)const;

-
-

        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual int get_link_index_from_name(const String &name)const;
        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual int get_link_index_from_name(const String &name)const;

diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp
index e959388..4c9b728 100644 (file)
--- a/synfig-core/src/synfig/valuenode_range.cpp
+++ b/synfig-core/src/synfig/valuenode_range.cpp
@@ -244,49 +244,6 @@ ValueNode_Range::get_link_vfunc(int i)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Range::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Range::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Min");
-               case 1: return _("Max");
-               case 2: return _("Link");
-               default: return String();
-       }
-}
-
-String
-ValueNode_Range::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "min";
-               case 1: return "max";
-               case 2: return "link";
-               default: return String();
-       }
-}
-
-int
-ValueNode_Range::get_link_index_from_name(const String &name)const
-{
-       if(name=="min") return 0;
-       if(name=="max") return 1;
-       if(name=="link") return 2;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_Range::get_name()const
 {
 String
 ValueNode_Range::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_range.h b/synfig-core/src/synfig/valuenode_range.h
index c347472..749e930 100644 (file)
--- a/synfig-core/src/synfig/valuenode_range.h
+++ b/synfig-core/src/synfig/valuenode_range.h
@@ -60,11 +60,6 @@ public:
        ValueBase get_inverse(Time t, const synfig::Angle &target_value) const;
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        ValueBase get_inverse(Time t, const synfig::Angle &target_value) 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:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 
 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);

diff --git a/synfig-core/src/synfig/valuenode_realstring.cpp b/synfig-core/src/synfig/valuenode_realstring.cpp
index cb0f4e6..aa4d834 100644 (file)
--- a/synfig-core/src/synfig/valuenode_realstring.cpp
+++ b/synfig-core/src/synfig/valuenode_realstring.cpp
@@ -155,53 +155,6 @@ ValueNode_RealString::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_RealString::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_RealString::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "real";
-               case 1: return "width";
-               case 2: return "precision";
-               case 3: return "zero_pad";
-       }
-       return String();
-}
-
-String
-ValueNode_RealString::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Real");
-               case 1: return _("Width");
-               case 2: return _("Precision");
-               case 3: return _("Zero Padded");
-       }
-       return String();
-}
-
-int
-ValueNode_RealString::get_link_index_from_name(const String &name)const
-{
-       if (name=="real") return 0;
-       if (name=="width") return 1;
-       if (name=="precision") return 2;
-       if (name=="zero_pad") return 3;
-
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_RealString::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_RealString::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_realstring.h b/synfig-core/src/synfig/valuenode_realstring.h
index 8584e98..cffcd2d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_realstring.h
+++ b/synfig-core/src/synfig/valuenode_realstring.h
@@ -58,13 +58,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_reciprocal.cpp b/synfig-core/src/synfig/valuenode_reciprocal.cpp
index 55dde10..2ebad84 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reciprocal.cpp
+++ b/synfig-core/src/synfig/valuenode_reciprocal.cpp
@@ -112,44 +112,6 @@ ValueNode_Reciprocal::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Reciprocal::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Reciprocal::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Link");
-       if(i==1) return _("Epsilon");
-       if(i==2) return _("Infinite");
-       return String();
-}
-
-String
-ValueNode_Reciprocal::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "link";
-       if(i==1) return "epsilon";
-       if(i==2) return "infinite";
-       return String();
-}
-
-int
-ValueNode_Reciprocal::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")     return 0;
-       if(name=="epsilon")  return 1;
-       if(name=="infinite") return 2;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Reciprocal::operator()(Time t)const
 {
 ValueBase
 ValueNode_Reciprocal::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_reciprocal.h b/synfig-core/src/synfig/valuenode_reciprocal.h
index b7d396b..1d7a6ba 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reciprocal.h
+++ b/synfig-core/src/synfig/valuenode_reciprocal.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_reference.cpp b/synfig-core/src/synfig/valuenode_reference.cpp
index a6ac870..1e1c890 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reference.cpp
+++ b/synfig-core/src/synfig/valuenode_reference.cpp
@@ -100,45 +100,6 @@ ValueNode_Reference::get_link_vfunc(int i __attribute__ ((unused)))const
        return link_;
 }
 
        return link_;
 }
 

-int
-ValueNode_Reference::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_Reference::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return _("Link");
-       }
-       return String();
-}
-
-String
-ValueNode_Reference::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "link";
-       }
-       return String();
-}
-
-int
-ValueNode_Reference::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")
-               return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Reference::operator()(Time t)const
 {
 ValueBase
 ValueNode_Reference::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_reference.h b/synfig-core/src/synfig/valuenode_reference.h
index f2329af..6c9f3c1 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reference.h
+++ b/synfig-core/src/synfig/valuenode_reference.h
@@ -52,13 +52,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
-

        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_Reference();
        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_Reference();

diff --git a/synfig-core/src/synfig/valuenode_repeat_gradient.cpp b/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
index 306b393..3a382f0 100644 (file)
--- a/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
+++ b/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
@@ -172,61 +172,6 @@ ValueNode_Repeat_Gradient::get_link_vfunc(int i)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Repeat_Gradient::link_count()const
-{
-       return 7;
-}
-
-String
-ValueNode_Repeat_Gradient::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:  return _("Gradient");
-               case 1:  return _("Count");
-               case 2:  return _("Width");
-               case 3:  return _("Specify Start");
-               case 4:  return _("Specify End");
-               case 5:  return _("Start Color");
-               case 6:  return _("End Color");
-               default: return String();
-       }
-}
-
-String
-ValueNode_Repeat_Gradient::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:  return "gradient";
-               case 1:  return "count";
-               case 2:  return "width";
-               case 3:  return "specify_start";
-               case 4:  return "specify_end";
-               case 5:  return "start_color";
-               case 6:  return "end_color";
-               default: return String();
-       }
-}
-
-int
-ValueNode_Repeat_Gradient::get_link_index_from_name(const String &name)const
-{
-       if(name=="gradient") return 0;
-       if(name=="count")    return 1;
-       if(name=="width")    return 2;
-       if(name=="specify_start") return 3;
-       if(name=="specify_end")   return 4;
-       if(name=="start_color")   return 5;
-       if(name=="end_color")     return 6;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_Repeat_Gradient::get_name()const
 {
 String
 ValueNode_Repeat_Gradient::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_repeat_gradient.h b/synfig-core/src/synfig/valuenode_repeat_gradient.h
index 931783c..f3e7e2e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_repeat_gradient.h
+++ b/synfig-core/src/synfig/valuenode_repeat_gradient.h
@@ -63,12 +63,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
 
        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 ValueBase operator()(Time t)const;
 
        virtual String get_name()const;
        virtual ValueBase operator()(Time t)const;
 
        virtual String get_name()const;

diff --git a/synfig-core/src/synfig/valuenode_scale.cpp b/synfig-core/src/synfig/valuenode_scale.cpp
index 7552cdb..ea46c04 100644 (file)
--- a/synfig-core/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/src/synfig/valuenode_scale.cpp
@@ -213,47 +213,6 @@ ValueNode_Scale::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Scale::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Scale::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Link");
-       else if(i==1)
-               return _("Scalar");
-       return String();
-}
-
-String
-ValueNode_Scale::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "link";
-       else if(i==1)
-               return "scalar";
-       return String();
-}
-
-int
-ValueNode_Scale::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")
-               return 0;
-       if(name=="scalar")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_Scale::get_name()const
 {
 String
 ValueNode_Scale::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_scale.h b/synfig-core/src/synfig/valuenode_scale.h
index 85fb1a6..f9bc17e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_scale.h
+++ b/synfig-core/src/synfig/valuenode_scale.h
@@ -57,11 +57,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 

-       virtual int link_count()const;
-
-       virtual String link_name(int i)const;
-       virtual int get_link_index_from_name(const String &name)const;
-

        virtual ValueBase operator()(Time t)const;
 
        //! Returns the modified Link to match the target value at time t
        virtual ValueBase operator()(Time t)const;
 
        //! Returns the modified Link to match the target value at time t


@@ -74,8 +69,6 @@ public:
 
        virtual String get_local_name()const;
 
 
        virtual String get_local_name()const;
 

-       virtual String link_local_name(int i)const;
-

 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 
 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 

diff --git a/synfig-core/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/src/synfig/valuenode_segcalctangent.cpp
index 8969221..9a00d11 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalctangent.cpp
+++ b/synfig-core/src/synfig/valuenode_segcalctangent.cpp
@@ -137,47 +137,6 @@ ValueNode_SegCalcTangent::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_SegCalcTangent::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_SegCalcTangent::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "segment";
-       if(i==1)
-               return "amount";
-       return String();
-}
-
-String
-ValueNode_SegCalcTangent::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Segment");
-       if(i==1)
-               return _("Amount");
-       return String();
-}
-
-int
-ValueNode_SegCalcTangent::get_link_index_from_name(const String &name)const
-{
-       if(name=="segment")
-               return 0;
-       if(name=="amount")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode*
 ValueNode_SegCalcTangent::create_new()const
 {
 LinkableValueNode*
 ValueNode_SegCalcTangent::create_new()const
 {

diff --git a/synfig-core/src/synfig/valuenode_segcalctangent.h b/synfig-core/src/synfig/valuenode_segcalctangent.h
index 26910e7..7bc2d88 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalctangent.h
+++ b/synfig-core/src/synfig/valuenode_segcalctangent.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
 
 protected:
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);

diff --git a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
index 6a88f06..419a995 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
@@ -135,47 +135,6 @@ ValueNode_SegCalcVertex::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_SegCalcVertex::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_SegCalcVertex::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "segment";
-       if(i==1)
-               return "amount";
-       return String();
-}
-
-String
-ValueNode_SegCalcVertex::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Segment");
-       if(i==1)
-               return _("Amount");
-       return String();
-}
-
-int
-ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const
-{
-       if(name=="segment")
-               return 0;
-       if(name=="amount")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode*
 ValueNode_SegCalcVertex::create_new()const
 {
 LinkableValueNode*
 ValueNode_SegCalcVertex::create_new()const
 {

diff --git a/synfig-core/src/synfig/valuenode_segcalcvertex.h b/synfig-core/src/synfig/valuenode_segcalcvertex.h
index 6053585..12a40f5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalcvertex.h
+++ b/synfig-core/src/synfig/valuenode_segcalcvertex.h
@@ -47,24 +47,14 @@ public:
        typedef etl::handle<ValueNode_SegCalcVertex> Handle;
        typedef etl::handle<const ValueNode_SegCalcVertex> ConstHandle;
 
        typedef etl::handle<ValueNode_SegCalcVertex> Handle;
        typedef etl::handle<const ValueNode_SegCalcVertex> ConstHandle;
 

-//     static Handle create(const ValueBase::Type &x=ValueBase::TYPE_VECTOR);
-
-

        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_SegCalcVertex();
 
        virtual String get_name()const;
        virtual String get_local_name()const;
        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_SegCalcVertex();
 
        virtual String get_name()const;
        virtual String get_local_name()const;

-//     static bool check_type(const ValueBase::Type &type);
-

 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_sine.cpp b/synfig-core/src/synfig/valuenode_sine.cpp
index 17d8efc..65552fa 100644 (file)
--- a/synfig-core/src/synfig/valuenode_sine.cpp
+++ b/synfig-core/src/synfig/valuenode_sine.cpp
@@ -141,47 +141,6 @@ ValueNode_Sine::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Sine::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_Sine::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "angle";
-       if(i==1)
-               return "amp";
-       return String();
-}
-
-String
-ValueNode_Sine::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Angle");
-       if(i==1)
-               return _("Amplitude");
-       return String();
-}
-
-int
-ValueNode_Sine::get_link_index_from_name(const String &name)const
-{
-       if(name=="angle")
-               return 0;
-       if(name=="amp")
-               return 1;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode::Vocab
 ValueNode_Sine::get_children_vocab_vfunc()const
 {
 LinkableValueNode::Vocab
 ValueNode_Sine::get_children_vocab_vfunc()const
 {

diff --git a/synfig-core/src/synfig/valuenode_sine.h b/synfig-core/src/synfig/valuenode_sine.h
index 0e5b9ec..eb66df4 100644 (file)
--- a/synfig-core/src/synfig/valuenode_sine.h
+++ b/synfig-core/src/synfig/valuenode_sine.h
@@ -56,13 +56,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_step.cpp b/synfig-core/src/synfig/valuenode_step.cpp
index 337657a..06a5935 100644 (file)
--- a/synfig-core/src/synfig/valuenode_step.cpp
+++ b/synfig-core/src/synfig/valuenode_step.cpp
@@ -184,55 +184,6 @@ ValueNode_Step::get_link_vfunc(int i)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Step::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_Step::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "link";
-       case 1: return "duration";
-       case 2: return "start_time";
-       case 3: return "intersection";
-       default:
-               return String();
-       }
-}
-
-String
-ValueNode_Step::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return _("Link");
-       case 1: return _("Duration");
-       case 2: return _("Start Time");
-       case 3: return _("Intersection");
-       default:
-               return String();
-       }
-}
-
-int
-ValueNode_Step::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")         return 0;
-       if(name=="duration")     return 1;
-       if(name=="start_time")   return 2;
-       if(name=="intersection") return 3;
-
-       throw Exception::BadLinkName(name);
-}
-

 LinkableValueNode::Vocab
 ValueNode_Step::get_children_vocab_vfunc()const
 {
 LinkableValueNode::Vocab
 ValueNode_Step::get_children_vocab_vfunc()const
 {

diff --git a/synfig-core/src/synfig/valuenode_step.h b/synfig-core/src/synfig/valuenode_step.h
index a24514d..ca36848 100644 (file)
--- a/synfig-core/src/synfig/valuenode_step.h
+++ b/synfig-core/src/synfig/valuenode_step.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_stripes.cpp b/synfig-core/src/synfig/valuenode_stripes.cpp
index 92e9420..e63ad81 100644 (file)
--- a/synfig-core/src/synfig/valuenode_stripes.cpp
+++ b/synfig-core/src/synfig/valuenode_stripes.cpp
@@ -158,66 +158,6 @@ ValueNode_Stripes::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Stripes::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_Stripes::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return _("Color 1");
-               case 1:
-                       return _("Color 2");
-               case 2:
-                       return _("Stripe Count");
-               case 3:
-                       return _("Width");
-               default:
-                       return String();
-       }
-}
-
-String
-ValueNode_Stripes::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return "color1";
-               case 1:
-                       return "color2";
-               case 2:
-                       return "stripes";
-               case 3:
-                       return "width";
-               default:
-                       return String();
-       }
-}
-
-int
-ValueNode_Stripes::get_link_index_from_name(const String &name)const
-{
-       if(name=="color1")
-               return 0;
-       if(name=="color2")
-               return 1;
-       if(name=="stripes")
-               return 2;
-       if(name=="width")
-               return 3;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_Stripes::get_name()const
 {
 String
 ValueNode_Stripes::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_stripes.h b/synfig-core/src/synfig/valuenode_stripes.h
index 9cce737..55fbf42 100644 (file)
--- a/synfig-core/src/synfig/valuenode_stripes.h
+++ b/synfig-core/src/synfig/valuenode_stripes.h
@@ -60,12 +60,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
 
        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 ValueBase operator()(Time t)const;
 
        virtual String get_name()const;
        virtual ValueBase operator()(Time t)const;
 
        virtual String get_name()const;

diff --git a/synfig-core/src/synfig/valuenode_subtract.cpp b/synfig-core/src/synfig/valuenode_subtract.cpp
index 34d9d56..c40d551 100644 (file)
--- a/synfig-core/src/synfig/valuenode_subtract.cpp
+++ b/synfig-core/src/synfig/valuenode_subtract.cpp
@@ -181,49 +181,6 @@ ValueNode_Subtract::get_link_vfunc(int i)const
        }
 }
 
        }
 }
 

-int
-ValueNode_Subtract::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Subtract::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_Subtract::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_Subtract::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_Subtract::get_name()const
 {
 String
 ValueNode_Subtract::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_subtract.h b/synfig-core/src/synfig/valuenode_subtract.h
index f9f4738..91851b8 100644 (file)
--- a/synfig-core/src/synfig/valuenode_subtract.h
+++ b/synfig-core/src/synfig/valuenode_subtract.h
@@ -56,10 +56,6 @@ public:
        virtual ValueBase operator()(Time t)const;
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
        virtual ValueBase operator()(Time t)const;
        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);
        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_switch.cpp b/synfig-core/src/synfig/valuenode_switch.cpp
index 9cd24ae..d52d87f 100644 (file)
--- a/synfig-core/src/synfig/valuenode_switch.cpp
+++ b/synfig-core/src/synfig/valuenode_switch.cpp
@@ -110,49 +110,6 @@ ValueNode_Switch::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_Switch::link_count()const
-{
-       return 3;
-}
-
-String
-ValueNode_Switch::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "link_off";
-       case 1: return "link_on";
-       case 2: return "switch";
-       }
-       return String();
-}
-
-String
-ValueNode_Switch::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "Link Off";
-       case 1: return "Link On";
-       case 2: return "Switch";
-       }
-       return String();
-}
-
-int
-ValueNode_Switch::get_link_index_from_name(const String &name)const
-{
-       if(name=="link_off") return 0;
-       if(name=="link_on" ) return 1;
-       if(name=="switch"  ) return 2;
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_Switch::operator()(Time t)const
 {
 ValueBase
 ValueNode_Switch::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_switch.h b/synfig-core/src/synfig/valuenode_switch.h
index b58216b..82f9c3b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_switch.h
+++ b/synfig-core/src/synfig/valuenode_switch.h
@@ -55,13 +55,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
-

        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_Switch();
        virtual ValueBase operator()(Time t)const;
 
        virtual ~ValueNode_Switch();

diff --git a/synfig-core/src/synfig/valuenode_timedswap.cpp b/synfig-core/src/synfig/valuenode_timedswap.cpp
index d232b99..ef2298d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/src/synfig/valuenode_timedswap.cpp
@@ -208,53 +208,6 @@ ValueNode_TimedSwap::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_TimedSwap::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_TimedSwap::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return _("Before");
-       case 1: return _("After");
-       case 2: return _("Swap Time");
-       case 3: return _("Swap Duration");
-       default:return String();
-       }
-}
-
-String
-ValueNode_TimedSwap::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-       case 0: return "before";
-       case 1: return "after";
-       case 2: return "time";
-       case 3: return "length";
-       default:return String();
-       }
-}
-
-int
-ValueNode_TimedSwap::get_link_index_from_name(const String &name)const
-{
-       if(name=="before")      return 0;
-       if(name=="after")       return 1;
-       if(name=="time")        return 2;
-       if(name=="length")      return 3;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_TimedSwap::get_name()const
 {
 String
 ValueNode_TimedSwap::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_timedswap.h b/synfig-core/src/synfig/valuenode_timedswap.h
index 2e235f3..c830f80 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timedswap.h
+++ b/synfig-core/src/synfig/valuenode_timedswap.h
@@ -58,10 +58,6 @@ public:
 
        virtual bool set_link_vfunc(int i,ValueNode::Handle x);
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
        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 ValueBase operator()(Time t)const;
 
 
        virtual ValueBase operator()(Time t)const;
 

diff --git a/synfig-core/src/synfig/valuenode_timeloop.cpp b/synfig-core/src/synfig/valuenode_timeloop.cpp
index f8b25ba..3559e57 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timeloop.cpp
+++ b/synfig-core/src/synfig/valuenode_timeloop.cpp
@@ -111,47 +111,6 @@ ValueNode_TimeLoop::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_TimeLoop::link_count()const
-{
-       return 4;
-}
-
-String
-ValueNode_TimeLoop::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return _("Link");
-       if(i==1) return _("Link Time");
-       if(i==2) return _("Local Time");
-       if(i==3) return _("Duration");
-       return String();
-}
-
-String
-ValueNode_TimeLoop::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0) return "link";
-       if(i==1) return "link_time";
-       if(i==2) return "local_time";
-       if(i==3) return "duration";
-       return String();
-}
-
-int
-ValueNode_TimeLoop::get_link_index_from_name(const String &name)const
-{
-       if(name=="link")       return 0;
-       if(name=="link_time")  return 1;
-       if(name=="local_time") return 2;
-       if(name=="duration")   return 3;
-
-       throw Exception::BadLinkName(name);
-}
-

 ValueBase
 ValueNode_TimeLoop::operator()(Time t)const
 {
 ValueBase
 ValueNode_TimeLoop::operator()(Time t)const
 {

diff --git a/synfig-core/src/synfig/valuenode_timeloop.h b/synfig-core/src/synfig/valuenode_timeloop.h
index bc37404..f9a62a4 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timeloop.h
+++ b/synfig-core/src/synfig/valuenode_timeloop.h
@@ -57,13 +57,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_timestring.cpp b/synfig-core/src/synfig/valuenode_timestring.cpp
index 5391add..93e7408 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timestring.cpp
+++ b/synfig-core/src/synfig/valuenode_timestring.cpp
@@ -143,44 +143,6 @@ ValueNode_TimeString::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_TimeString::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_TimeString::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return "time";
-       }
-       return String();
-}
-
-String
-ValueNode_TimeString::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0: return _("Time");
-       }
-       return String();
-}
-
-int
-ValueNode_TimeString::get_link_index_from_name(const String &name)const
-{
-       if (name=="time") return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 bool
 ValueNode_TimeString::check_type(ValueBase::Type type)
 {
 bool
 ValueNode_TimeString::check_type(ValueBase::Type type)
 {

diff --git a/synfig-core/src/synfig/valuenode_timestring.h b/synfig-core/src/synfig/valuenode_timestring.h
index ed29f71..03176e5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timestring.h
+++ b/synfig-core/src/synfig/valuenode_timestring.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_twotone.cpp b/synfig-core/src/synfig/valuenode_twotone.cpp
index 3777686..e4603cb 100644 (file)
--- a/synfig-core/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/src/synfig/valuenode_twotone.cpp
@@ -122,54 +122,6 @@ ValueNode_TwoTone::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_TwoTone::link_count()const
-{
-       return 2;
-}
-
-String
-ValueNode_TwoTone::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return _("Color1");
-               case 1:
-                       return _("Color2");
-               default:
-                       return String();
-       }
-}
-
-String
-ValueNode_TwoTone::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       switch(i)
-       {
-               case 0:
-                       return "color1";
-               case 1:
-                       return "color2";
-               default:
-                       return String();
-       }
-}
-
-int
-ValueNode_TwoTone::get_link_index_from_name(const String &name)const
-{
-       if(name=="color1")
-               return 0;
-       if(name=="color2")
-               return 1;
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_TwoTone::get_name()const
 {
 String
 ValueNode_TwoTone::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_twotone.h b/synfig-core/src/synfig/valuenode_twotone.h
index a5caed3..8cd6c33 100644 (file)
--- a/synfig-core/src/synfig/valuenode_twotone.h
+++ b/synfig-core/src/synfig/valuenode_twotone.h
@@ -52,12 +52,6 @@ public:
 
        virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
 
 
        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 ValueBase operator()(Time t)const;
 
        virtual String get_name()const;
        virtual ValueBase operator()(Time t)const;
 
        virtual String get_name()const;

diff --git a/synfig-core/src/synfig/valuenode_vectorangle.cpp b/synfig-core/src/synfig/valuenode_vectorangle.cpp
index 9d11649..950d8d5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorangle.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorangle.cpp
@@ -115,41 +115,6 @@ ValueNode_VectorAngle::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_VectorAngle::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_VectorAngle::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Vector");
-       return String();
-}
-
-String
-ValueNode_VectorAngle::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "vector";
-       return String();
-}
-
-int
-ValueNode_VectorAngle::get_link_index_from_name(const String &name)const
-{
-       if(name=="vector")
-               return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_VectorAngle::get_name()const
 {
 String
 ValueNode_VectorAngle::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_vectorangle.h b/synfig-core/src/synfig/valuenode_vectorangle.h
index e8068df..6f5ca1a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorangle.h
+++ b/synfig-core/src/synfig/valuenode_vectorangle.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_vectorlength.cpp b/synfig-core/src/synfig/valuenode_vectorlength.cpp
index dc69acd..6963e39 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorlength.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorlength.cpp
@@ -114,41 +114,6 @@ ValueNode_VectorLength::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_VectorLength::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_VectorLength::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Vector");
-       return String();
-}
-
-String
-ValueNode_VectorLength::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "vector";
-       return String();
-}
-
-int
-ValueNode_VectorLength::get_link_index_from_name(const String &name)const
-{
-       if(name=="vector")
-               return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_VectorLength::get_name()const
 {
 String
 ValueNode_VectorLength::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_vectorlength.h b/synfig-core/src/synfig/valuenode_vectorlength.h
index d195684..71af366 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorlength.h
+++ b/synfig-core/src/synfig/valuenode_vectorlength.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_vectorx.cpp b/synfig-core/src/synfig/valuenode_vectorx.cpp
index 11ed424..a1dedaa 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorx.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorx.cpp
@@ -114,41 +114,6 @@ ValueNode_VectorX::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_VectorX::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_VectorX::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Vector");
-       return String();
-}
-
-String
-ValueNode_VectorX::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "vector";
-       return String();
-}
-
-int
-ValueNode_VectorX::get_link_index_from_name(const String &name)const
-{
-       if(name=="vector")
-               return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_VectorX::get_name()const
 {
 String
 ValueNode_VectorX::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_vectorx.h b/synfig-core/src/synfig/valuenode_vectorx.h
index 61744f2..2000bac 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorx.h
+++ b/synfig-core/src/synfig/valuenode_vectorx.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;

diff --git a/synfig-core/src/synfig/valuenode_vectory.cpp b/synfig-core/src/synfig/valuenode_vectory.cpp
index 4e49cdc..fa5cd45 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectory.cpp
+++ b/synfig-core/src/synfig/valuenode_vectory.cpp
@@ -114,41 +114,6 @@ ValueNode_VectorY::get_link_vfunc(int i)const
        return 0;
 }
 
        return 0;
 }
 

-int
-ValueNode_VectorY::link_count()const
-{
-       return 1;
-}
-
-String
-ValueNode_VectorY::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return _("Vector");
-       return String();
-}
-
-String
-ValueNode_VectorY::link_name(int i)const
-{
-       assert(i>=0 && i<link_count());
-
-       if(i==0)
-               return "vector";
-       return String();
-}
-
-int
-ValueNode_VectorY::get_link_index_from_name(const String &name)const
-{
-       if(name=="vector")
-               return 0;
-
-       throw Exception::BadLinkName(name);
-}
-

 String
 ValueNode_VectorY::get_name()const
 {
 String
 ValueNode_VectorY::get_name()const
 {

diff --git a/synfig-core/src/synfig/valuenode_vectory.h b/synfig-core/src/synfig/valuenode_vectory.h
index d5d498d..296648d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectory.h
+++ b/synfig-core/src/synfig/valuenode_vectory.h
@@ -55,13 +55,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
 
        virtual String get_name()const;
        virtual String get_local_name()const;
 

-

        virtual ValueNode::LooseHandle get_link_vfunc(int i)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;
 
 protected:
        LinkableValueNode* create_new()const;