X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fwaypoint.cpp;h=1befa6f23725e2f86602d08dfebb5c9011dc7bb7;hb=f444974043946c071373c9caf7e7c85f9e1f9354;hp=2fa82a2fda08508173d91b5da94c29e26502fa67;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/waypoint.cpp b/synfig-core/trunk/src/synfig/waypoint.cpp
index 2fa82a2..1befa6f 100644
--- a/synfig-core/trunk/src/synfig/waypoint.cpp
+++ b/synfig-core/trunk/src/synfig/waypoint.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file waypoint.cpp
 **	\brief Template File
 **
-**	$Id: waypoint.cpp,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
 **
-**	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
 */
 /* ========================================================================= */
@@ -37,7 +38,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -62,7 +63,7 @@ Waypoint::Waypoint(ValueBase value, Time time):
 		after=before=INTERPOLATION_LINEAR;
 }
 
-Waypoint::Waypoint(ValueNode::Handle value_node, Time time):
+Waypoint::Waypoint(etl::handle<ValueNode> value_node, Time time):
 	priority_(0),
 	before(INTERPOLATION_TCB),
 	after(INTERPOLATION_TCB),
@@ -98,7 +99,7 @@ Waypoint::set_value(const ValueBase &x)
 }
 
 void
-Waypoint::set_value_node(const ValueNode::Handle &x)
+Waypoint::set_value_node(const etl::handle<ValueNode> &x)
 {
 	if(!value_node && x->get_type()==ValueBase::TYPE_ANGLE)
 		after=before=INTERPOLATION_LINEAR;
@@ -147,7 +148,7 @@ Waypoint::get_value()const { return (*value_node)(0); }
 ValueBase
 Waypoint::get_value(const Time &t)const { return (*value_node)(t); }
 
-sinfg::GUID
+synfig::GUID
 Waypoint::get_guid()const
 {
 	return GUID::hasher(get_uid());