Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
index 0e7e133..cf8798f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
@@ -36,6 +36,8 @@
 #include <synfig/paramdesc.h>
 #include <ETL/clock>
 
+#include "general.h"
+
 class Profiler : private etl::clock
 {
        const std::string name;
@@ -107,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();
 }
@@ -115,7 +117,7 @@ ChildrenTreeStore::rebuild()
 void
 ChildrenTreeStore::refresh()
 {
-       Profiler profiler("ChildrenTreeStore::refresh()");
+       // Profiler profiler("ChildrenTreeStore::refresh()");
        refresh_value_nodes();
        refresh_canvases();
 }
@@ -146,7 +148,6 @@ ChildrenTreeStore::refresh_value_nodes()
                for(iter = children.begin(); iter != children.end(); ++iter)
                {
                        Gtk::TreeRow row=*iter;
-                       //DEBUGPOINT();
                        refresh_row(row);
                }
 }
@@ -183,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()));
 
@@ -206,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;
@@ -223,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);
@@ -238,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();
 
@@ -296,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())
@@ -331,7 +331,7 @@ ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_renamed(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_renamed(synfig::ValueNode::Handle value_node __attribute__ ((unused)))
 {
        rebuild_value_nodes();
 }
@@ -384,6 +384,6 @@ ChildrenTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int colu
        }
        catch(std::exception x)
        {
-               g_warning(x.what());
+               g_warning("%s", x.what());
        }
 }