X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=2efc2e61122e8e276835f1e79028ed351ec82e2d;hb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;hp=528eaeb406398aa33bab62fdffc2e5ec4e44b000;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
index 528eaeb..2efc2e6 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
@@ -5,16 +5,17 @@
 **	$Id: valuedescdisconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	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
 */
 /* ========================================================================= */
@@ -70,7 +71,7 @@ Action::ParamVocab
 Action::ValueDescDisconnect::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("ValueDesc"))
 	);
@@ -79,14 +80,14 @@ Action::ValueDescDisconnect::get_param_vocab()
 		.set_local_name(_("Time"))
 		.set_optional()
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::ValueDescDisconnect::is_canidate(const ParamList &x)
+Action::ValueDescDisconnect::is_candidate(const ParamList &x)
 {
-	if(canidate_check(get_param_vocab(),x))
+	if(candidate_check(get_param_vocab(),x))
 	{
 		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
 		if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
@@ -106,14 +107,14 @@ Action::ValueDescDisconnect::set_param(const synfig::String& name, const Action:
 	if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
 	{
 		value_desc=param.get_value_desc();
-		
+
 		return true;
 	}
 
 	if(name=="time" && param.get_type()==Param::TYPE_TIME)
 	{
 		time=param.get_time();
-		
+
 		return true;
 	}
 
@@ -134,60 +135,60 @@ Action::ValueDescDisconnect::prepare()
 	clear();
 
 	if(value_desc.parent_is_canvas())
-	{				
+	{
 		ValueNode::Handle src_value_node;
 		src_value_node=ValueNode_Const::create((*value_desc.get_value_node())(time));
 
 		Action::Handle action(ValueNodeReplace::create());
-		
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("src",src_value_node);
 		action->set_param("dest",value_desc.get_value_node());
-	
+
 		assert(action->is_ready());
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-	
+
 		add_action_front(action);
-		return;		
+		return;
 	}
 	else
 	if(value_desc.parent_is_linkable_value_node())
 	{
 		Action::Handle action(ValueNodeLinkDisconnect::create());
-		
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("parent_value_node",value_desc.get_parent_value_node());
 		action->set_param("index",value_desc.get_index());
 		action->set_param("time",time);
-	
+
 		assert(action->is_ready());
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-	
+
 		add_action_front(action);
-		return;		
+		return;
 	}
 	else
 	if(value_desc.parent_is_layer_param())
 	{
 		Action::Handle action(LayerParamDisconnect::create());
-		
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("layer",value_desc.get_layer());
 		action->set_param("param",value_desc.get_param_name());
 		action->set_param("time",time);
-	
-		assert(action->is_ready());		
+
+		assert(action->is_ready());
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-	
+
 		add_action_front(action);
-		return;		
+		return;
 	}
-	
-	throw Error(_("ValueDesc is not recognised or supported."));	
+
+	throw Error(_("ValueDesc is not recognised or supported."));
 }