X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_composite.cpp;h=859ff093c01b33922ea2e641cc78f61b8a54a415;hb=bd8367952ea2be0ab1e94922922409bf5f9a0be8;hp=e29b37875560bee47e192251341af7157919b9c4;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp index e29b378..859ff09 100644 --- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp @@ -2,7 +2,7 @@ /*! \file valuenode_composite.cpp ** \brief Template File ** -** $Id: valuenode_composite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -88,7 +88,7 @@ synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value): } default: assert(0); - throw Exception::BadType(ValueBase::type_name(get_type())); + throw Exception::BadType(ValueBase::type_name(get_type())); } } @@ -102,7 +102,7 @@ ValueNode_Composite::create(const ValueBase &value) { return new ValueNode_Composite(value); } - + LinkableValueNode* ValueNode_Composite::create_new()const { @@ -186,7 +186,7 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x) { assert(i>=0); assert(i<6); - + if(PlaceholderValueNode::Handle::cast_dynamic(x)) { components[i]=x; @@ -212,7 +212,7 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x) return true; } break; - + case ValueBase::TYPE_SEGMENT: assert(i<4); if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x)) @@ -240,11 +240,11 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x) return true; } break; - + default: break; } - return false; + return false; } ValueNode::LooseHandle @@ -272,7 +272,7 @@ ValueNode_Composite::link_local_name(int i)const return _("Blue"); else if(i==3) return _("Alpha"); - + case ValueBase::TYPE_SEGMENT: if(i==0) return _("Vertex 1"); @@ -298,10 +298,9 @@ ValueNode_Composite::link_local_name(int i)const return _("Tangent 2"); default: - break; + return etl::strprintf(_("C%d"),i+1); } - return etl::strprintf(_("C%d"),i+1); -} +} String @@ -309,7 +308,7 @@ ValueNode_Composite::link_name(int i)const { assert(i>=0 && i<5); return strprintf("c%d",i); -} +} int ValueNode_Composite::get_link_index_from_name(const String &name)const @@ -360,7 +359,7 @@ ValueNode_Composite::get_link_index_from_name(const String &name)const return 4; if(name=="t2") return 5; - default: + default: break; }