Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / valuelink.cpp

diff --git a/synfig-studio/tags/stable/src/gtkmm/valuelink.cpp b/synfig-studio/tags/stable/src/gtkmm/valuelink.cpp
index 7732d33..910bc3a 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/valuelink.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/valuelink.cpp
@@ -31,6 +31,8 @@
 
 #include "valuelink.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -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)
        {
@@ -131,7 +133,7 @@ ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(ValueNode::Hand
 
        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)
        {
@@ -144,7 +146,7 @@ ValueBaseLink::list_type::iterator ValueBaseLink::findlink(ValueNode::Handle x)
        return list.end();
 }
 
-void ValueBaseLink::add(ValueNode::Handle v)
+void ValueBaseLink::add(synfig::ValueNode::Handle v)
 {
        list_type::iterator i = findlink(v);
 
@@ -154,7 +156,7 @@ void ValueBaseLink::add(ValueNode::Handle v)
        }
 }
 
-void ValueBaseLink::remove(ValueNode::Handle v)
+void ValueBaseLink::remove(synfig::ValueNode::Handle v)
 {
        list_type::iterator i = findlink(v);