X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Ftimegather.h;h=5db4afd772b4211f89059a5f2ac888773b016672;hb=ea5537774c9f663f0d918d1445e75bedee35574a;hp=becac172273dde7499dc667ef437748ac22d3392;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/timegather.h b/synfig-studio/trunk/src/synfigapp/timegather.h
index becac17..5db4afd 100644
--- a/synfig-studio/trunk/src/synfigapp/timegather.h
+++ b/synfig-studio/trunk/src/synfigapp/timegather.h
@@ -2,7 +2,7 @@
 /*!	\file timegather.h
 **	\brief Time Gather Header
 **
-**	$Id: timegather.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2004 Adrian Bentley
@@ -46,7 +46,7 @@ struct ValueBaseTimeInfo
 {
 	synfig::ValueNode_Animated::Handle	val;
 	mutable std::set<synfig::Waypoint>	waypoints;
-	
+
 	bool operator<(const ValueBaseTimeInfo &rhs) const
 	{
 		return val < rhs.val;
@@ -60,32 +60,32 @@ struct ActiveTimeInfo
 		bool operator()(const synfig::Activepoint &lhs, const synfig::Activepoint &rhs) const
 		{
 			return lhs.time < rhs.time;
-		}		
+		}
 	};
-	
+
 	synfigapp::ValueDesc						val;
-	
+
 	typedef std::set<synfig::Activepoint,actcmp>	set;
-	
+
 	mutable set activepoints;
-	
+
 	bool operator<(const ActiveTimeInfo &rhs) const
 	{
-		return val.get_parent_value_node() == rhs.val.get_parent_value_node() ? 
-						val.get_index() < rhs.val.get_index() : 
+		return val.get_parent_value_node() == rhs.val.get_parent_value_node() ?
+						val.get_index() < rhs.val.get_index() :
 						val.get_parent_value_node() < rhs.val.get_parent_value_node();
 	}
 };
 
 struct timepoints_ref
 {
-	typedef std::set<ValueBaseTimeInfo>		waytracker;	
+	typedef std::set<ValueBaseTimeInfo>		waytracker;
 	typedef std::set<ActiveTimeInfo>	acttracker;
-	
+
 	waytracker		waypointbiglist;
-	acttracker		actpointbiglist;	
-	
-	void insert(synfig::ValueNode_Animated::Handle v, synfig::Waypoint w);	
+	acttracker		actpointbiglist;
+
+	void insert(synfig::ValueNode_Animated::Handle v, synfig::Waypoint w);
 	void insert(synfigapp::ValueDesc v, synfig::Activepoint a);
 };
 
@@ -94,9 +94,9 @@ struct timepoints_ref
 template < typename I1, typename I2 >
 bool check_intersect(I1 b1, I1 end1, I2 b2, I2 end2)
 {
-	if(b1 == end1 || b2 == end2) 
+	if(b1 == end1 || b2 == end2)
 		return false;
-	
+
 	for(; b1 != end1 && b2 != end2;)
 	{
 		if(*b1 < *b2) ++b1;
@@ -110,21 +110,21 @@ bool check_intersect(I1 b1, I1 end1, I2 b2, I2 end2)
 	return false;
 }
 
-//pointer kind of a hack, gets the accurate times from a value desc 
+//pointer kind of a hack, gets the accurate times from a value desc
 //	(deals with dynamic list member correctly... i.e. gathers activepoints)
 const synfig::Node::time_set *get_times_from_vdesc(const synfigapp::ValueDesc &v);
 
 //get's the closest time inside the set
-bool get_closest_time(const synfig::Node::time_set &tset, const synfig::Time &t, 
+bool get_closest_time(const synfig::Node::time_set &tset, const synfig::Time &t,
 						const synfig::Time &range, synfig::Time &out);
 
 //recursion functions based on time restrictions (can be expanded later)...
 //builds a list of relevant waypoints and activepoints inside the timepoints_ref structure
 void recurse_valuedesc(synfigapp::ValueDesc valdesc, const std::set<synfig::Time> &tlist,
 								timepoints_ref &vals);
-void recurse_layer(synfig::Layer::Handle layer, const std::set<synfig::Time> &tlist, 
+void recurse_layer(synfig::Layer::Handle layer, const std::set<synfig::Time> &tlist,
 								timepoints_ref &vals);
-void recurse_canvas(synfig::Canvas::Handle canvas, const std::set<synfig::Time> &tlist, 
+void recurse_canvas(synfig::Canvas::Handle canvas, const std::set<synfig::Time> &tlist,
 								timepoints_ref &vals);