Removed a bunch more DEBUGPOINT()s.

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

diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
index c76b003..cb8440d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
@@ -30,18 +30,19 @@
 #endif
 
 #include "layertreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <gtkmm/button.h>
 #include <synfig/paramdesc.h>
 #include <synfigapp/action.h>
 #include <synfigapp/instance.h>
 #include "app.h"
 #include "instance.h"
-#include "iconcontroler.h"
 #include <synfigapp/action_system.h>
 
 #include <gtk/gtkversion.h>
 #include <ETL/clock>
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -96,8 +97,7 @@ LayerTreeStore::LayerTreeStore(etl::loose_handle<synfigapp::CanvasInterface> can
 
 LayerTreeStore::~LayerTreeStore()
 {
-       synfig::info("LayerTreeStore::~LayerTreeStore()q: Deleted");
-
+       synfig::info("LayerTreeStore::~LayerTreeStore(): Deleted");
 }
 
 int
@@ -158,8 +158,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                g_value_init(value.gobj(),x.value_type());
                g_value_copy(x.gobj(),value.gobj());
        }
-       else
-       if(column==model.z_depth.index())
+       else if(column==model.z_depth.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -173,8 +172,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                g_value_init(value.gobj(),x.value_type());
                g_value_copy(x.gobj(),value.gobj());
        }
-       else
-       if(column==model.children_lock.index())
+       else if(column==model.children_lock.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -191,8 +189,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                g_value_init(value.gobj(),x.value_type());
                g_value_copy(x.gobj(),value.gobj());
        }
-       else
-       if(column==model.label.index())
+       else if(column==model.label.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -201,18 +198,13 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                Glib::Value<Glib::ustring> x;
                g_value_init(x.gobj(),x.value_type());
 
-
-               if(!layer->get_description().empty())
-                       x.set(layer->get_description());
-               else
-                       x.set(layer->get_local_name());
+               x.set(layer->get_non_empty_description());
 
                g_value_init(value.gobj(),x.value_type());
                //g_value_copy(x.gobj(),value.gobj());
                value=x;
        }
-       else
-       if(column==model.tooltip.index())
+       else if(column==model.tooltip.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -228,8 +220,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                //g_value_copy(x.gobj(),value.gobj());
                value=x;
        }
-       else
-       if(column==model.canvas.index())
+       else if(column==model.canvas.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -245,8 +236,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                //g_value_copy(x.gobj(),value.gobj());
                value=x;
        }
-       else
-       if(column==model.active.index())
+       else if(column==model.active.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -260,8 +250,7 @@ LayerTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colum
                g_value_init(value.gobj(),x.value_type());
                g_value_copy(x.gobj(),value.gobj());
        }
-       else
-       if(column==model.icon.index())
+       else if(column==model.icon.index())
        {
                synfig::Layer::Handle layer((*iter)[model.layer]);
                if(!layer)return;
@@ -329,8 +318,7 @@ LayerTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int column,
                        canvas_interface()->get_instance()->perform_action(action);
                        return;
                }
-               else
-               if(column==model.active.index())
+               else if(column==model.active.index())
                {
                        synfig::Layer::Handle layer((*iter)[model.layer]);
 
@@ -367,7 +355,7 @@ LayerTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int column,
 
 
 bool
-LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& path)const
+LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& /*path*/)const
 {
        //if(!get_iter(path)) return false;
 //     Gtk::TreeModel::Row row(*get_iter(path));
@@ -421,7 +409,7 @@ LayerTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::Selection
 }
 
 bool
-LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& path)
+LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& /*path*/)
 {
        return true;
 }
@@ -450,13 +438,8 @@ LayerTreeStore::row_drop_possible_vfunc (const TreeModel::Path& dest, const Gtk:
                        //dest_canvas=(Canvas::Handle)(row[model.canvas]);
                        return true;
                }
-               else
-               {
-                       if((bool)const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))
-                               return (bool)(Canvas::Handle)(*const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))[model.contained_canvas];
-                       else
-                               return false;
-               }
+               else if((bool)const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))
+                       return (bool)(Canvas::Handle)(*const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))[model.contained_canvas];
        }
        return false;
 }
@@ -521,9 +504,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk
                                continue;
 
                        if(dest_canvas==src->get_canvas() && src->get_depth()<dest_layer_depth)
-                       {
                                dest_layer_depth--;
-                       }
 
                        // In this case, we are just moving.
 //                     if(dest_canvas==src->get_canvas())
@@ -540,13 +521,9 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk
                                action->set_param("new_index",dest_layer_depth);
                                action->set_param("dest_canvas",dest_canvas);
                                if(canvas_interface()->get_instance()->perform_action(action))
-                               {
-                                       //DEBUGPOINT();
                                        ret=true;
-                               }
                                else
                                {
-                                       //DEBUGPOINT();
                                        passive_grouper.cancel();
                                        return false;
                                }
@@ -598,7 +575,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk
                        */
                }
        }
-       synfig::info("I suposidly moved %d layers",i);
+       synfig::info("I supposedly moved %d layers",i);
 
        // Reselect the previously selected layers
        canvas_interface()->get_selection_manager()->set_selected_layers(selected_layer_list);
@@ -606,12 +583,6 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk
        return ret;
 }
 
-
-
-
-
-
-
 void
 LayerTreeStore::rebuild()
 {
@@ -741,7 +712,6 @@ LayerTreeStore::set_row_layer(Gtk::TreeRow &row,synfig::Layer::Handle &handle)
                        continue;
                }
 
-
                /*
                etl::handle<ValueNode> value_node;
                if(handle.constant()->dynamic_param_list().count(iter->get_name()))
@@ -805,7 +775,6 @@ LayerTreeStore::on_layer_inserted(synfig::Layer::Handle handle,int depth)
                return;
        }
 
-
        Gtk::TreeModel::Children children_(children());
        if(canvas_interface()->get_canvas()!=handle->get_canvas())
        {
@@ -833,11 +802,10 @@ LayerTreeStore::on_layer_inserted(synfig::Layer::Handle handle,int depth)
 
        Gtk::TreeModel::Row row(*insert(iter));
        set_row_layer(row,handle);
-
 }
 
 void
-LayerTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool x)
+LayerTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool /*x*/)
 {
        Gtk::TreeModel::Children::iterator iter;
        if(find_layer_row(handle,iter))
@@ -906,7 +874,7 @@ LayerTreeStore::on_layer_raised(synfig::Layer::Handle layer)
 }
 
 void
-LayerTreeStore::on_layer_moved(synfig::Layer::Handle layer,int depth, synfig::Canvas::Handle canvas)
+LayerTreeStore::on_layer_moved(synfig::Layer::Handle layer,int depth, synfig::Canvas::Handle /*canvas*/)
 {
        on_layer_removed(layer);
        on_layer_inserted(layer,depth);
@@ -925,25 +893,21 @@ LayerTreeStore::on_layer_param_changed(synfig::Layer::Handle handle,synfig::Stri
        }
 
        /*
-       //DEBUGPOINT();
        Gtk::TreeModel::Children::iterator iter;
        if(find_layer_row(handle,iter))
        {
-               //DEBUGPOINT();
                Gtk::TreeModel::Children children(iter->children());
 
                for(iter = children.begin(); iter && iter != children.end(); ++iter)
                {
                        if((Glib::ustring)(*iter)[model.param_name]==param_name)
                        {
-                               //DEBUGPOINT();
                                Gtk::TreeRow row=*iter;
                                refresh_row(row);
                                return;
                        }
                }
        }
-       //DEBUGPOINT();
        rebuild();
        */
 }
@@ -1022,7 +986,7 @@ LayerTreeStore::find_canvas_row(synfig::Canvas::Handle canvas, Gtk::TreeModel::C
 
 
 bool
-LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canvas::Handle canvas, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev)
+LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canvas::Handle /*canvas*/, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev)
 {
        assert(layer);
 
@@ -1036,7 +1000,6 @@ LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canv
                }
 
                iter=children().end();
-               //DEBUGPOINT();
                //return false;
        }