X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.h;h=ecd82556c7650aa3e3a637030d01680685aa3e75;hb=241290ec883794d1579593182b337277f6ef5182;hp=96a928e86a6258d3049028afb4513a980e325917;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h
index 96a928e..ecd8255 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.h
+++ b/synfig-core/trunk/src/synfig/loadcanvas.h
@@ -2,7 +2,7 @@
 /*!	\file loadcanvas.h
 **	\brief writeme
 **
-**	$Id: loadcanvas.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -35,11 +35,7 @@
 #include "valuenode_subtract.h"
 #include "valuenode_animated.h"
 #include "valuenode_composite.h"
-#include "valuenode_const.h"
-#include "valuenode_linear.h"
 #include "valuenode_dynamiclist.h"
-#include "valuenode_reference.h"
-#include "valuenode_timedswap.h"
 #include "keyframe.h"
 #include "guid.h"
 
@@ -115,7 +111,7 @@ public:
 	void set_path(const synfig::String& x) { path=x; }
 
 	const synfig::String& get_path()const { return path; }
-	
+
 	//! \todo writeme
 	Canvas::Handle parse_from_file(const String &filename);
 
@@ -144,18 +140,18 @@ private:
 
 	// ValueBase Parsing Functions
 
-	Real parse_real(xmlpp::Element *node,Canvas::Handle canvas);
+	Real parse_real(xmlpp::Element *node);
 	Time parse_time(xmlpp::Element *node,Canvas::Handle canvas);
-	int parse_integer(xmlpp::Element *node,Canvas::Handle canvas);
-	Vector parse_vector(xmlpp::Element *node,Canvas::Handle canvas);
-	Color parse_color(xmlpp::Element *node,Canvas::Handle canvas);
-	Angle parse_angle(xmlpp::Element *node,Canvas::Handle canvas);
-	String parse_string(xmlpp::Element *node,Canvas::Handle canvas);
-	bool parse_bool(xmlpp::Element *node,Canvas::Handle canvas);
-	Segment parse_segment(xmlpp::Element *node,Canvas::Handle canvas);
+	int parse_integer(xmlpp::Element *node);
+	Vector parse_vector(xmlpp::Element *node);
+	Color parse_color(xmlpp::Element *node);
+	Angle parse_angle(xmlpp::Element *node);
+	String parse_string(xmlpp::Element *node);
+	bool parse_bool(xmlpp::Element *node);
+	Segment parse_segment(xmlpp::Element *node);
 	ValueBase parse_list(xmlpp::Element *node,Canvas::Handle canvas);
-	Gradient parse_gradient(xmlpp::Element *node,Canvas::Handle canvas);
-	BLinePoint parse_bline_point(xmlpp::Element *node,Canvas::Handle canvas);
+	Gradient parse_gradient(xmlpp::Element *node);
+	BLinePoint parse_bline_point(xmlpp::Element *node);
 
 	Keyframe parse_keyframe(xmlpp::Element *node,Canvas::Handle canvas);
 
@@ -163,7 +159,6 @@ private:
 
 	etl::handle<ValueNode_Animated> parse_animated(xmlpp::Element *node,Canvas::Handle canvas);
 	etl::handle<ValueNode_Subtract> parse_subtract(xmlpp::Element *node,Canvas::Handle canvas);
-	etl::handle<ValueNode_Animated> parse_timedswap(xmlpp::Element *node,Canvas::Handle canvas);
 	etl::handle<LinkableValueNode> parse_linkable_value_node(xmlpp::Element *node,Canvas::Handle canvas);
 	etl::handle<ValueNode_Composite> parse_composite(xmlpp::Element *node,Canvas::Handle canvas);
 	etl::handle<ValueNode_DynamicList> parse_dynamic_list(xmlpp::Element *node,Canvas::Handle canvas);