Use LinkableValueNode members functions when possible in the derived valuenodes.

[synfig.git] / synfig-core / src / synfig / valuenode_composite.cpp

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)
 {
@@ -259,60 +240,6 @@ ValueNode_Composite::get_link_vfunc(int i)const
 }
 
 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());
@@ -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);
 
-       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
 {
+       // 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);