X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeyframetreestore.cpp;h=945273438d823429beabbb52565991acad1b1dc5;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=5ce4c7cfb8bc4f698d8489c27482497b290783c3;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
index 5ce4c7c..9452734 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
@@ -32,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>
@@ -46,6 +46,8 @@
 #include "onemoment.h"
 #include <synfig/exception.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -346,7 +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' uninitialised
+			// 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;
@@ -664,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;
 
@@ -794,7 +796,7 @@ KeyframeTreeStore::find_row(const synfig::Keyframe &keyframe)
 }
 
 void
-KeyframeTreeStore::add_keyframe(Keyframe keyframe)
+KeyframeTreeStore::add_keyframe(synfig::Keyframe keyframe)
 {
 	try
 	{
@@ -815,7 +817,7 @@ KeyframeTreeStore::add_keyframe(Keyframe keyframe)
 }
 
 void
-KeyframeTreeStore::remove_keyframe(Keyframe keyframe)
+KeyframeTreeStore::remove_keyframe(synfig::Keyframe keyframe)
 {
 	try
 	{
@@ -835,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
 	{
@@ -854,7 +855,6 @@ KeyframeTreeStore::change_keyframe(Keyframe keyframe)
 
 		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++)
 			{
@@ -879,7 +879,6 @@ KeyframeTreeStore::change_keyframe(Keyframe keyframe)
 	}
 	catch(std::exception x)
 	{
-		DEBUGPOINT();
 		g_warning(x.what());
 	}
 }