X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_dynamiclist.cpp;h=3f28bc2095aa93766f74e73486d854d63557e425;hb=7c70b39267a02a92da8293b4ff5759b3f4f738d9;hp=198b993be31d292c0256bcf658890fc9a9c05c6f;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
index 198b993..3f28bc2 100644
--- a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file valuenode_dynamiclist.cpp
 **	\brief Template File
 **
 **	$Id: valuenode_dynamiclist.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -44,7 +45,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -76,7 +77,7 @@ ValueNode_DynamicList::ListEntry::ListEntry(const ValueNode::Handle &value_node,
 ValueNode_DynamicList::ListEntry::ActivepointList::iterator
 ValueNode_DynamicList::ListEntry::add(Time time, bool status, int priority)
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator;
 	
 	//! \optimize
 	Activepoint ap(time,status,priority);
@@ -92,7 +93,7 @@ ValueNode_DynamicList::ListEntry::add(Time time, bool status, int priority)
 ValueNode_DynamicList::ListEntry::ActivepointList::iterator
 ValueNode_DynamicList::ListEntry::add(const Activepoint &x)
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator;
 	
 	//! \optimize
 	Activepoint ap(x);
@@ -137,7 +138,7 @@ ValueNode_DynamicList::create_list_entry(int index, Time time, Real origin)
 	ValueNode_DynamicList::ListEntry ret;
 	
 	
-	sinfg::ValueBase prev,next;
+	synfig::ValueBase prev,next;
 
 	index=index%link_count();
 
@@ -223,7 +224,7 @@ ValueNode_DynamicList::ListEntry::erase(const UniqueID& x)
 ValueNode_DynamicList::ListEntry::ActivepointList::iterator
 ValueNode_DynamicList::ListEntry::find(const Time& x)
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::iterator iter;
 
@@ -237,7 +238,7 @@ ValueNode_DynamicList::ListEntry::find(const Time& x)
 ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator
 ValueNode_DynamicList::ListEntry::find(const Time& x)const
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::const_iterator iter;
 
@@ -251,7 +252,7 @@ ValueNode_DynamicList::ListEntry::find(const Time& x)const
 ValueNode_DynamicList::ListEntry::ActivepointList::iterator
 ValueNode_DynamicList::ListEntry::find_next(const Time& x)
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::iterator iter;
 
@@ -265,7 +266,7 @@ ValueNode_DynamicList::ListEntry::find_next(const Time& x)
 ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator
 ValueNode_DynamicList::ListEntry::find_next(const Time& x)const
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::const_iterator iter;
 
@@ -279,7 +280,7 @@ ValueNode_DynamicList::ListEntry::find_next(const Time& x)const
 ValueNode_DynamicList::ListEntry::ActivepointList::iterator
 ValueNode_DynamicList::ListEntry::find_prev(const Time& x)
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::iterator iter;
 	iter=timing_info.end();
@@ -297,7 +298,7 @@ ValueNode_DynamicList::ListEntry::find_prev(const Time& x)
 ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator
 ValueNode_DynamicList::ListEntry::find_prev(const Time& x)const
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::const_iterator iter;
 	iter=timing_info.end();
@@ -349,8 +350,8 @@ ValueNode_DynamicList::ListEntry::find(const Time& begin,const Time& end,std::ve
 float
 ValueNode_DynamicList::ListEntry::amount_at_time(const Time &t,bool *rising)const
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	if(timing_info.empty())
 		return 1.0f;
@@ -397,8 +398,8 @@ ValueNode_DynamicList::ListEntry::new_activepoint_at_time(const Time& time)const
 bool
 ValueNode_DynamicList::ListEntry::status_at_time(const Time &t)const
 {
-	typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
-	typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+	typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
+	typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 	
 	ActivepointList::const_iterator entry_iter;
 	ActivepointList::const_iterator prev_iter;
@@ -594,16 +595,16 @@ ValueNode_DynamicList::operator()(Time t)const
 				ret_list.push_back((*iter->value_node)(t));
 			else
 			{
-				sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("List type/item type mismatch, throwing away mismatch"));
+				synfig::warning(string("ValueNode_DynamicList::operator()():")+_("List type/item type mismatch, throwing away mismatch"));
 			}
 		}
 	}
 	
 	if(list.empty())
-		sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in list"));
+		synfig::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in list"));
 	else
 	if(ret_list.empty())
-		sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in ret_list"));
+		synfig::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in ret_list"));
 
 	return ret_list;
 }
@@ -749,9 +750,9 @@ ValueNode_DynamicList::find_prev_valid_entry(int orig_item, Time t)const
 	return curr_item;
 }
 
-const sinfg::Node::time_set	& ValueNode_DynamicList::ListEntry::get_times() const
+const synfig::Node::time_set	& ValueNode_DynamicList::ListEntry::get_times() const
 {
-	sinfg::ActivepointList::const_iterator 	j = timing_info.begin(),
+	synfig::ActivepointList::const_iterator 	j = timing_info.begin(),
 											end = timing_info.end();
 		
 	//must remerge with all the other values because we don't know if we've changed...