X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframeset.h;h=51e0b132feb1883e0619062714c8aa8893543ab9;hb=828216f2051e31236e9edbc79be2cf7833abbc7e;hp=518e995b3a444f3af5c77951b1d00a5ad1df790f;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h
index 518e995..51e0b13 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h
+++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.h
@@ -2,19 +2,20 @@
 /*!	\file keyframeset.h
 **	\brief Template File
 **
-**	$Id: keyframeset.h,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
 */
 /* ========================================================================= */
@@ -55,11 +56,11 @@ private:
 	synfig::Time new_time;
 
 	synfig::Time keyframe_prev,keyframe_next;
-	
+
 	std::set<synfig::GUID> guid_set;
 
 	void process_value_desc(const synfigapp::ValueDesc& value_desc);
-	
+
 	int scale_activepoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end);
 	int scale_waypoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end);
 
@@ -68,7 +69,7 @@ public:
 	KeyframeSet();
 
 	static ParamVocab get_param_vocab();
-	static bool is_canidate(const ParamList &x);
+	static bool is_candidate(const ParamList &x);
 
 	virtual bool set_param(const synfig::String& name, const Param &);
 	virtual bool is_ready()const;