Added copyright lines for files I've edited this year.

[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 a9092be..f49d7a3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
@@ -2,10 +2,11 @@
 /*!    \file canvastreestore.cpp
 **     \brief Template File
 **
-**     $Id: canvastreestore.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -31,7 +32,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 +41,8 @@
 #include "cellrenderer_timetrack.h"
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -75,7 +78,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 +207,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
                        {
@@ -284,7 +287,8 @@ CanvasTreeStore::find_first_value_desc(const synfigapp::ValueDesc& value_desc, G
                if(!iter->children().empty())
                {
                        Gtk::TreeIter iter2(iter->children().begin());
-                       if(iter2 && value_desc==(*iter2)[model.value_desc] || find_next_value_desc(value_desc, iter2))
+                       //! \todo confirm that the && should be done before the ||
+                       if((iter2 && value_desc==(*iter2)[model.value_desc]) || find_next_value_desc(value_desc, iter2))
                        {
                                iter=iter2;
                                return true;
@@ -308,7 +312,8 @@ CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gt
                if(!iter->children().empty())
                {
                        Gtk::TreeIter iter2(iter->children().begin());
-                       if(iter2 && value_desc==(*iter2)[model.value_desc] || find_next_value_desc(value_desc, iter2))
+                       //! \todo confirm that the && should be done before the ||
+                       if((iter2 && value_desc==(*iter2)[model.value_desc]) || find_next_value_desc(value_desc, iter2))
                        {
                                iter=iter2;
                                return true;
@@ -326,13 +331,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])
@@ -340,7 +340,8 @@ CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk:
                if(!iter->children().empty())
                {
                        Gtk::TreeIter iter2(iter->children().begin());
-                       if(iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node] || find_next_value_node(value_node, iter2))
+                       //! \todo confirm that the && should be done before the ||
+                       if((iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node]) || find_next_value_node(value_node, iter2))
                        {
                                iter=iter2;
                                return true;
@@ -356,7 +357,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);
 
@@ -364,7 +365,8 @@ CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::
                if(!iter->children().empty())
                {
                        Gtk::TreeIter iter2(iter->children().begin());
-                       if(iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node] || find_next_value_node(value_node, iter2))
+                       //! \todo confirm that the && should be done before the ||
+                       if((iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node]) || find_next_value_node(value_node, iter2))
                        {
                                iter=iter2;
                                return true;
@@ -386,7 +388,8 @@ void
 CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children)
 {
        Gtk::TreeModel::Children children = row.children();
-       while(!children.empty() && erase(children.begin()));
+       while(!children.empty() && erase(children.begin()))
+               ;
 
        row[model.value_desc]=value_desc;
        try
@@ -567,7 +570,8 @@ CanvasTreeStore::rebuild_row(Gtk::TreeModel::Row &row, bool do_children)
                row[model.is_value_node] = false;
                row[model.is_editable] = true;
                Gtk::TreeModel::Children children = row.children();
-               while(!children.empty() && erase(children.begin()));
+               while(!children.empty() && erase(children.begin()))
+                       ;
        }
        if(!do_children)
                return;