X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_subtract.h;h=6c446d6160a2c8bd23e154b465bac4635c0a3193;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=2bcd08a7395606129bbe79e457cf1527f2f6f813;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.h b/synfig-core/trunk/src/synfig/valuenode_subtract.h
index 2bcd08a..6c446d6 100644
--- a/synfig-core/trunk/src/synfig/valuenode_subtract.h
+++ b/synfig-core/trunk/src/synfig/valuenode_subtract.h
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_subtract.h
-**	\brief Template Header
+**	\brief Header file for implementation of the "Subtract" valuenode conversion.
 **
-**	$Id: valuenode_subtract.h,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 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
 */
 /* ========================================================================= */
@@ -38,67 +40,39 @@ struct ValueNode_Subtract : public LinkableValueNode
 {
 	typedef etl::handle<ValueNode_Subtract> Handle;
 	typedef etl::handle<const ValueNode_Subtract> ConstHandle;
-	
-protected:
 
-	ValueNode_Subtract();
+protected:
+	ValueNode_Subtract(const ValueBase &value);
 
 private:
-
 	ValueNode::RHandle ref_a;
 	ValueNode::RHandle ref_b;
 	ValueNode::RHandle scalar;
 
 public:
-
+	LinkableValueNode* create_new()const;
+	static ValueNode_Subtract* create(const ValueBase &value=ValueBase());
 	virtual ~ValueNode_Subtract();
-
-//	static Handle create(ValueBase::Type id=ValueBase::TYPE_NIL);
-
-	//! Sets the left-hand-side value_node
-	bool set_lhs(ValueNode::Handle a);
-
-	//! Gets the left-hand-side value_node
-	ValueNode::Handle get_lhs()const { return ref_a; }
-
-	//! Sets the right-hand-side value_node
-	bool set_rhs(ValueNode::Handle b);
-
-	//! Gets the right-hand-side value_node
-	ValueNode::Handle get_rhs()const { return ref_b; }
-
-	//! Sets the scalar value_node
-	bool set_scalar(ValueNode::Handle x);
-
-	//! Gets the scalar value_node
-	ValueNode::Handle get_scalar()const { return scalar; }
-
-	void set_scalar(Real x);
-
+	virtual ValueBase operator()(Time t)const;
 	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
-
 	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
-
 	virtual int link_count()const;
-
 	virtual String link_local_name(int i)const;
 	virtual String link_name(int i)const;
 	virtual int get_link_index_from_name(const String &name)const;
-
-	virtual ValueBase operator()(Time t)const;
-
 	virtual String get_name()const;
 	virtual String get_local_name()const;
+	static bool check_type(ValueBase::Type type);
 
-//	static bool check_type(const ValueBase::Type &type);
+	//! Gets the left-hand-side value_node
+	ValueNode::Handle get_lhs()const { return ref_a; }
 
-	LinkableValueNode* create_new()const;
+	//! Gets the right-hand-side value_node
+	ValueNode::Handle get_rhs()const { return ref_b; }
+
+	//! Gets the scalar value_node
+	ValueNode::Handle get_scalar()const { return scalar; }
 
-public:
-	using synfig::LinkableValueNode::get_link_vfunc;
-	using synfig::LinkableValueNode::set_link_vfunc;
-	static bool check_type(ValueBase::Type type);
-	static ValueNode_Subtract* create(const ValueBase &x=ValueBase());
 }; // END of class ValueNode_Subtract
 
 }; // END of namespace synfig