X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Factivepoint.h;h=74e2edcca6738d063e5cd0dda5b96cbe56ab8933;hb=6390167d6b2b1fdd04505017b8ec43b18ac167b8;hp=37e6397acbbb766d2ad76d6bfd3d9215fd4b008b;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/activepoint.h b/synfig-core/trunk/src/synfig/activepoint.h
index 37e6397..74e2edc 100644
--- a/synfig-core/trunk/src/synfig/activepoint.h
+++ b/synfig-core/trunk/src/synfig/activepoint.h
@@ -1,28 +1,31 @@
-/* === S I N F G =========================================================== */
+#include <stdio.h>
+/* === S Y N F I G ========================================================= */
 /*!	\file activepoint.h
 **	\brief Template Header
 **
-**	$Id: activepoint.h,v 1.1.1.1 2005/01/04 01:23:14 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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_ACTIVEPOINT_H
-#define __SINFG_ACTIVEPOINT_H
+#ifndef __SYNFIG_ACTIVEPOINT_H
+#define __SYNFIG_ACTIVEPOINT_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -36,32 +39,33 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 class GUID;
 class ValueNode;
-	
+
 struct Activepoint : public UniqueID
 {
 private:
 	etl::loose_handle<ValueNode> parent_;
 	int index;
-	
+
 public:
 	//! Time of the activepoint
 	Time time;
-	
+
 	//! Priority
 	int priority;
 
 	//! Does this activepoint turn the entry on, or off?
 	bool state;
-		
+
 	bool operator<(const Activepoint& rhs) { return time<rhs.time; }
 	bool operator<(const Time& rhs) { return time<rhs; }
-	
+
 	Activepoint(const Time &time, const bool &state, int p=0): time(time), priority(p),state(state) { }
-	Activepoint() { }
-	
+	//! \todo Should priority be initialized here, or elsewhere?  This avoids a valgrind warning for now.
+	Activepoint(): priority(0) { }
+
 	const Time& get_time()const { return time; }
 	void set_time(const Time& x) { time=x; }
 
@@ -72,15 +76,15 @@ public:
 	void set_priority(int x) { priority=x; }
 
 	const etl::loose_handle<ValueNode> &get_parent_value_node()const { return parent_; }
-	void set_parent_value_node(const etl::loose_handle<ValueNode> &x) { parent_=x; }	
-	
+	void set_parent_value_node(const etl::loose_handle<ValueNode> &x) { parent_=x; }
+
 	int get_parent_index()const { return index; }
 	void set_parent_index(int x) { index=x; }
-	
+
 	GUID get_guid()const;
 }; // END of struct ValueNode_BLine::Activepoint
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */