X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointremove.cpp;h=b7d2973e92d8dd53fe98f9d079b9b0e2c493d557;hb=a11a35f647a3a6e61518ddfd61c9e199e25da3ef;hp=bff1bd9b3cc293ade38c4401a017b9cf5cee08f2;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
index bff1bd9..b7d2973 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
@@ -2,19 +2,20 @@
 /*!	\file activepointremove.cpp
 **	\brief Template File
 **
-**	$Id: activepointremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\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
 */
 /* ========================================================================= */
@@ -48,7 +49,7 @@ ACTION_SET_TASK(Action::ActivepointRemove,"remove");
 ACTION_SET_CATEGORY(Action::ActivepointRemove,Action::CATEGORY_ACTIVEPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointRemove,0);
 ACTION_SET_VERSION(Action::ActivepointRemove,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointRemove,"$Id: activepointremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -66,7 +67,7 @@ Action::ParamVocab
 Action::ActivepointRemove::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("ValueDesc"))
 	);
@@ -80,9 +81,9 @@ Action::ActivepointRemove::get_param_vocab()
 }
 
 bool
-Action::ActivepointRemove::is_canidate(const ParamList &x)
+Action::ActivepointRemove::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_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
@@ -99,23 +100,23 @@ Action::ActivepointRemove::set_param(const synfig::String& name, const Action::P
 	if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
 	{
 		ValueDesc value_desc(param.get_value_desc());
-		
+
 		if(!value_desc.parent_is_value_node())
 			return false;
-		
+
 		value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
-		
+
 		if(!value_node)
 			return false;
-		
+
 		index=value_desc.get_index();
-		
+
 		return true;
 	}
 	if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT)
 	{
 		activepoint=param.get_activepoint();
-		
+
 		return true;
 	}
 
@@ -132,18 +133,18 @@ Action::ActivepointRemove::is_ready()const
 
 void
 Action::ActivepointRemove::perform()
-{	
+{
 	ValueNode_DynamicList::ListEntry::ActivepointList::iterator iter;
-	
+
 	try { iter=value_node->list[index].find(activepoint); }
 	catch(synfig::Exception::NotFound)
 	{
 		throw Error(_("Unable to find activepoint"));
-	}	
+	}
 
 	value_node->list[index].erase(activepoint);
 	value_node->changed();
-	
+
 	/*
 	// Signal that a layer has been inserted
 	if(get_canvas_interface())
@@ -158,11 +159,11 @@ void
 Action::ActivepointRemove::undo()
 {
 	try { value_node->list[index].find(activepoint.get_time()); throw Error(_("A Activepoint already exists at this point in time"));}
-	catch(synfig::Exception::NotFound) { }	
+	catch(synfig::Exception::NotFound) { }
 
 	try { if(value_node->list[index].find(activepoint)!=value_node->list[index].timing_info.end()) throw Error(_("This activepoint is already in the ValueNode"));}
-	catch(synfig::Exception::NotFound) { }	
-	
+	catch(synfig::Exception::NotFound) { }
+
 	value_node->list[index].add(activepoint);
 	value_node->changed();
 	/*