X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fvaluelink.cpp;h=910bc3af04f863ed5c12620c7f846d9b159bdcf3;hb=1b138b535876987c79453888f370d71910d975ed;hp=c38dbe57095053186132e424f3eb7aef435f4b58;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/valuelink.cpp b/synfig-studio/trunk/src/gtkmm/valuelink.cpp index c38dbe5..910bc3a 100644 --- a/synfig-studio/trunk/src/gtkmm/valuelink.cpp +++ b/synfig-studio/trunk/src/gtkmm/valuelink.cpp @@ -2,7 +2,7 @@ /*! \file valuelink.cpp ** \brief ValueBase Link Implementation File ** -** $Id: valuelink.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2004 Adrian Bentley @@ -31,6 +31,8 @@ #include "valuelink.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -65,12 +67,12 @@ ValueBaseLink::~ValueBaseLink() ValueNode::LooseHandle ValueBaseLink::get_link_vfunc(int i)const { /*list_type::const_iterator it = list.begin(); - + while(it != list.end() && i-- > 0) { ++it; } - + if(it == list.end()) { return ValueNode::LooseHandle(); @@ -99,7 +101,7 @@ String ValueBaseLink::link_local_name(int i)const if(h) { - return h->get_local_name(); + return h->get_local_name(); }else return String(); } @@ -113,13 +115,13 @@ String ValueBaseLink::link_name(int i)const }else return String(); } -int ValueBaseLink::get_link_index_from_name(const String &name)const +int ValueBaseLink::get_link_index_from_name(const synfig::String &name)const { throw Exception::BadLinkName(name); } //list management stuff -ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(ValueNode::Handle x) const +ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(synfig::ValueNode::Handle x) const { for(list_type::const_iterator i = list.begin(); i != list.end(); ++i) { @@ -128,10 +130,10 @@ ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(ValueNode::Hand return i; } } - + return list.end(); } -ValueBaseLink::list_type::iterator ValueBaseLink::findlink(ValueNode::Handle x) +ValueBaseLink::list_type::iterator ValueBaseLink::findlink(synfig::ValueNode::Handle x) { for(list_type::iterator i = list.begin(); i != list.end(); ++i) { @@ -140,24 +142,24 @@ ValueBaseLink::list_type::iterator ValueBaseLink::findlink(ValueNode::Handle x) return i; } } - + return list.end(); } -void ValueBaseLink::add(ValueNode::Handle v) +void ValueBaseLink::add(synfig::ValueNode::Handle v) { list_type::iterator i = findlink(v); - + if(i != list.end()) { list.push_back(v); } } -void ValueBaseLink::remove(ValueNode::Handle v) +void ValueBaseLink::remove(synfig::ValueNode::Handle v) { list_type::iterator i = findlink(v); - + if(i != list.end()) { if(i != list.end()-1) @@ -165,5 +167,5 @@ void ValueBaseLink::remove(ValueNode::Handle v) *i = list.back(); } list.pop_back(); - } + } }