X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode.cpp;h=9f4e627e941dfa10711bba38eb8949b3b3e708c6;hb=00644fdca1f213c58b42e7ec396bd29a0e4f5a02;hp=5358530b5f39f291977b0f3e38d1f97fc96de173;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 5358530..9f4e627 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -1,27 +1,28 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file value_node.cpp ** \brief Template File ** ** $Id: valuenode.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 */ /* ========================================================================= */ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE //#define HAS_HASH_MAP 1 @@ -61,7 +62,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -73,7 +74,7 @@ static LinkableValueNode::Book *book_; ValueNode::LooseHandle -sinfg::find_value_node(const GUID& guid) +synfig::find_value_node(const GUID& guid) { return guid_cast(guid); } @@ -117,23 +118,23 @@ ValueNode::subsys_stop() /* if(global_value_node_map.size() || value_node_count) { if(value_node_count) - sinfg::error("%d ValueNodes haven't been destroyed yet!",value_node_count); + synfig::error("%d ValueNodes haven't been destroyed yet!",value_node_count); if(global_value_node_map.size()!=value_node_count) - sinfg::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count); + synfig::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count); GlobalValueNodeMap::iterator iter; for(iter=global_value_node_map.begin();iter!=global_value_node_map.end();++iter) { if(!iter->second->is_exported()) - sinfg::info("%s: count:%d name:%s type:%s", + synfig::info("%s: count:%d name:%s type:%s", iter->first.get_string().c_str(), iter->second->count(), iter->second->get_name().c_str(), ValueBase::type_name(iter->second->get_type()).c_str() ); else - sinfg::info("%s: id:%s count:%d name:%s type:%s", + synfig::info("%s: id:%s count:%d name:%s type:%s", iter->first.get_string().c_str(), iter->second->get_id().c_str(), iter->second->count(),