X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_radialcomposite.cpp;h=40ce2b6b4ae58fee4a0bb83f84f96dc5f60ee9b2;hb=82f8b521a55c8985cd0189c9c71940a7312eccaa;hp=8b21fab698f399d481b208f0ee1b1117192cac5a;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
index 8b21fab..40ce2b6 100644
--- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file valuenode_radialcomposite.cpp
-**	\brief Template File
+**	\brief Implementation of the "Radial Composite" valuenode conversion.
 **
-**	$Id: valuenode_radialcomposite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -39,7 +41,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -49,7 +51,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value):
+synfig::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
 	switch(get_type())
@@ -69,7 +71,7 @@ sinfg::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &val
 			break;
 		default:
 			assert(0);
-			throw Exception::BadType(ValueBase::type_name(get_type()));			
+			throw Exception::BadType(ValueBase::type_name(get_type()));
 	}
 }
 
@@ -83,7 +85,7 @@ ValueNode_RadialComposite::create(const ValueBase &value)
 {
 	return new ValueNode_RadialComposite(value);
 }
-	
+
 LinkableValueNode*
 ValueNode_RadialComposite::create_new()const
 {
@@ -91,7 +93,7 @@ ValueNode_RadialComposite::create_new()const
 }
 
 ValueBase
-sinfg::ValueNode_RadialComposite::operator()(Time t)const
+synfig::ValueNode_RadialComposite::operator()(Time t)const
 {
 	switch(get_type())
 	{
@@ -115,7 +117,7 @@ sinfg::ValueNode_RadialComposite::operator()(Time t)const
 			);
 		}
 		default:
-			sinfg::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite"));
+			synfig::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite"));
 			assert(components[0]);
 			return (*components[0])(t);
 	}
@@ -131,7 +133,7 @@ ValueNode_RadialComposite::link_count()const
 	case ValueBase::TYPE_COLOR:
 		return 4;
 	default:
-		sinfg::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
+		synfig::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
 		return 1;
 	}
 }
@@ -141,7 +143,7 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {
 	assert(i>=0);
 	assert(i<6);
-	
+
 	if(PlaceholderValueNode::Handle::cast_dynamic(x))
 	{
 		components[i]=x;
@@ -169,12 +171,12 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 			components[i]=x;
 			return true;
 			break;
-			
-			
+
+
 		default:
 			break;
 	}
-	return false;	
+	return false;
 }
 
 ValueNode::LooseHandle
@@ -207,12 +209,13 @@ ValueNode_RadialComposite::link_local_name(int i)const
 			else if(i==3)
 				return _("Alpha");
 			break;
-			
+
 		default:
 			break;
 	}
-	return etl::strprintf(_("C%d"),i+1);	
-}	
+
+	return etl::strprintf(_("C%d"),i+1);
+}
 
 
 String
@@ -220,7 +223,7 @@ ValueNode_RadialComposite::link_name(int i)const
 {
 	assert(i>=0 && i<5);
 	return strprintf("c%d",i);
-}	
+}
 
 int
 ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
@@ -247,7 +250,7 @@ ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 			return 0;
 		if(name[0]=='t')
 			return 1;
-	default:			
+	default:
 		break;
 	}
 
@@ -263,7 +266,7 @@ ValueNode_RadialComposite::get_name()const
 String
 ValueNode_RadialComposite::get_local_name()const
 {
-	return _("RadialComposite");
+	return _("Radial Composite");
 }
 
 bool