Use Layer::get_non_empty_description() instead of checking whether the description...

[synfig.git] / synfig-studio / trunk / src / gtkmm / canvastreestore.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
index 5cf393b..d9bacd3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
@@ -31,7 +31,7 @@
 
 #include "canvastreestore.h"
 #include <synfig/valuenode.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <synfig/valuenode_timedswap.h>
 #include <synfig/valuenode_animated.h>
 #include <gtkmm/button.h>
@@ -40,6 +40,8 @@
 #include "cellrenderer_timetrack.h"
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -75,7 +77,7 @@ CanvasTreeStore::~CanvasTreeStore()
 }
 
 void
-CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const
+CanvasTreeStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const
 {
        if(column==model.value.index())
        {
@@ -204,7 +206,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu
                {
                        if(!value_desc.is_value_node() || value_desc.get_value_node()->get_name()=="constant")
                        {
-                               x.set(ValueBase::type_name(value_desc.get_value_type()));
+                               x.set(ValueBase::type_local_name(value_desc.get_value_type()));
                        }
                        else
                        {
@@ -326,13 +328,8 @@ CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gt
        return (bool)iter && value_desc==(*iter)[model.value_desc];
 }
 
-
-
-
-
-
 bool
-CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_first_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
 {
        iter=children().begin();
        while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node])
@@ -356,7 +353,7 @@ CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk:
 }
 
 bool
-CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_next_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
 {
        if(!iter) return find_first_value_node(value_node,iter);