X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeyframetreestore.cpp;h=f9470775466b86474a67906e42407f719141e302;hb=f3aafc647c21fa0713a641ed78f38a9cefb2d6d1;hp=df40eacd56db63c8480c9c88a8f2e99fef97c62a;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
index df40eac..f947077 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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 "keyframetreestore.h"
 #include <synfig/valuenode.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <synfig/valuenode_timedswap.h>
 #include <gtkmm/button.h>
 #include <gtkmm/treerowreference.h>
@@ -45,6 +46,8 @@
 #include "onemoment.h"
 #include <synfig/exception.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -188,7 +191,7 @@ KeyframeTreeStore_Class::init()
 }
 
 void
-KeyframeTreeStore_Class::class_init_function(gpointer g_class, gpointer class_data)
+KeyframeTreeStore_Class::class_init_function(gpointer /*g_class*/, gpointer /*class_data*/)
 {
 	// ???
 }
@@ -258,7 +261,7 @@ KeyframeTreeStore::iterator_sane(const Gtk::TreeModel::iterator& iter)const
 }
 
 inline void
-KeyframeTreeStore::dump_iterator(const GtkTreeIter* gtk_iter, const Glib::ustring &name)const
+KeyframeTreeStore::dump_iterator(const GtkTreeIter* /*gtk_iter*/, const Glib::ustring &/*name*/)const
 {
 #if 0
 	if(!gtk_iter)
@@ -345,6 +348,7 @@ KeyframeTreeStore::set_value_impl(const Gtk::TreeModel::iterator& row, int colum
 				// Bad old delta
 				return;
 			}
+			// row(row) on the next line is bad - don't use it, because it leaves 'row' uninitialized
 			//Gtk::TreeModel::iterator row(row);
 			//row++;
 			//if(!row)return;
@@ -662,7 +666,7 @@ KeyframeTreeStore::unref_node_vfunc (iterator& xiter)const
 }
 
 Gtk::TreeModel::Path
-KeyframeTreeStore::get_path_vfunc (const TreeModel::iterator& gtk_iter)const
+KeyframeTreeStore::get_path_vfunc (const iterator& gtk_iter)const
 {
 	Gtk::TreeModel::Path path;
 
@@ -792,7 +796,7 @@ KeyframeTreeStore::find_row(const synfig::Keyframe &keyframe)
 }
 
 void
-KeyframeTreeStore::add_keyframe(Keyframe keyframe)
+KeyframeTreeStore::add_keyframe(synfig::Keyframe keyframe)
 {
 	try
 	{
@@ -813,7 +817,7 @@ KeyframeTreeStore::add_keyframe(Keyframe keyframe)
 }
 
 void
-KeyframeTreeStore::remove_keyframe(Keyframe keyframe)
+KeyframeTreeStore::remove_keyframe(synfig::Keyframe keyframe)
 {
 	try
 	{
@@ -833,13 +837,12 @@ KeyframeTreeStore::remove_keyframe(Keyframe keyframe)
 	}
 	catch(std::exception x)
 	{
-		DEBUGPOINT();
 		g_warning(x.what());
 	}
 }
 
 void
-KeyframeTreeStore::change_keyframe(Keyframe keyframe)
+KeyframeTreeStore::change_keyframe(synfig::Keyframe keyframe)
 {
 	try
 	{
@@ -848,11 +851,11 @@ KeyframeTreeStore::change_keyframe(Keyframe keyframe)
 		unsigned int new_index(get_index_from_model_iter(row));
 		unsigned int old_index(0);
 		synfig::KeyframeList::iterator iter;
-		for(old_index=0,iter=old_keyframe_list.begin();iter!=old_keyframe_list.end() && (UniqueID)*iter!=(UniqueID)keyframe;++iter,old_index++);
+		for(old_index=0,iter=old_keyframe_list.begin();iter!=old_keyframe_list.end() && (UniqueID)*iter!=(UniqueID)keyframe;++iter,old_index++)
+			;
 
 		if(iter!=old_keyframe_list.end() && new_index!=old_index)
 		{
-			DEBUGPOINT();
 			std::vector<int> new_order;
 			for(unsigned int i=0;i<old_keyframe_list.size();i++)
 			{
@@ -877,7 +880,6 @@ KeyframeTreeStore::change_keyframe(Keyframe keyframe)
 	}
 	catch(std::exception x)
 	{
-		DEBUGPOINT();
 		g_warning(x.what());
 	}
 }