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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/childrentreestore.cpp b/synfig-studio/tags/stable/src/gtkmm/childrentreestore.cpp
index 4561e44..5903550 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/childrentreestore.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/childrentreestore.cpp
@@ -31,11 +31,13 @@
 #endif
 
 #include "childrentreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <gtkmm/button.h>
 #include <synfig/paramdesc.h>
 #include <ETL/clock>
 
+#include "general.h"
+
 class Profiler : private etl::clock
 {
        const std::string name;
@@ -84,6 +86,7 @@ ChildrenTreeStore::ChildrenTreeStore(etl::loose_handle<synfigapp::CanvasInterfac
 
        // Connect all the signals
        canvas_interface()->signal_value_node_changed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_changed));
+       canvas_interface()->signal_value_node_renamed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_renamed));
        canvas_interface()->signal_value_node_added().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_added));
        canvas_interface()->signal_value_node_deleted().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_deleted));
        canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_replaced));
@@ -106,7 +109,7 @@ ChildrenTreeStore::create(etl::loose_handle<synfigapp::CanvasInterface> canvas_i
 void
 ChildrenTreeStore::rebuild()
 {
-       Profiler profiler("ChildrenTreeStore::rebuild()");
+       // Profiler profiler("ChildrenTreeStore::rebuild()");
        rebuild_value_nodes();
        rebuild_canvases();
 }
@@ -114,7 +117,7 @@ ChildrenTreeStore::rebuild()
 void
 ChildrenTreeStore::refresh()
 {
-       Profiler profiler("ChildrenTreeStore::refresh()");
+       // Profiler profiler("ChildrenTreeStore::refresh()");
        refresh_value_nodes();
        refresh_canvases();
 }
@@ -145,7 +148,6 @@ ChildrenTreeStore::refresh_value_nodes()
                for(iter = children.begin(); iter != children.end(); ++iter)
                {
                        Gtk::TreeRow row=*iter;
-                       //DEBUGPOINT();
                        refresh_row(row);
                }
 }
@@ -182,7 +184,7 @@ ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/)
 }
 
 void
-ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
+ChildrenTreeStore::on_canvas_added(synfig::Canvas::Handle canvas)
 {
        Gtk::TreeRow row = *(prepend(canvas_row.children()));
 
@@ -205,13 +207,13 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
 }
 
 void
-ChildrenTreeStore::on_canvas_removed(Canvas::Handle /*canvas*/)
+ChildrenTreeStore::on_canvas_removed(synfig::Canvas::Handle /*canvas*/)
 {
        rebuild_canvases();
 }
 
 void
-ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
+ChildrenTreeStore::on_value_node_added(synfig::ValueNode::Handle value_node)
 {
 //     if(value_node->get_id().find("Unnamed")!=String::npos)
 //             return;
@@ -222,7 +224,7 @@ ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_deleted(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_deleted(synfig::ValueNode::Handle value_node)
 {
        Gtk::TreeIter iter;
        //int i(0);
@@ -237,8 +239,7 @@ ChildrenTreeStore::on_value_node_deleted(etl::handle<ValueNode> value_node)
 bool
 ChildrenTreeStore::execute_changed_value_nodes()
 {
-       Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
-       DEBUGPOINT();
+       // Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
        if(!replaced_set_.empty())
                rebuild_value_nodes();
 
@@ -295,7 +296,7 @@ ChildrenTreeStore::execute_changed_value_nodes()
 }
 
 void
-ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_changed(synfig::ValueNode::Handle value_node)
 {
 
        if(!value_node->is_exported())
@@ -330,6 +331,12 @@ ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
 }
 
 void
+ChildrenTreeStore::on_value_node_renamed(synfig::ValueNode::Handle value_node __attribute__ ((unused)))
+{
+       rebuild_value_nodes();
+}
+
+void
 ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle /*new_value_node*/)
 {
        changed_connection.disconnect();