X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptree.cpp;h=e4615fa13cbd0c175d14ea65af0503f094a0bcf9;hb=32d54ad4e87fa4b94c09e5d85e90a0da2b71cc8d;hp=88dc5fe0ec03b70bc3b213037ca5cbaa1513d54e;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
index 88dc5fe..e4615fa 100644
--- a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file layergrouptree.cpp
 **	\brief Template File
 **
 **	$Id: layergrouptree.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -28,7 +29,7 @@
 #	include <config.h>
 #endif
 
-#include <sinfg/layer.h>
+#include <synfig/layer.h>
 #include "layergrouptree.h"
 #include <gtkmm/treemodelsort.h>
 #include <ETL/misc>
@@ -39,7 +40,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -107,7 +108,7 @@ LayerGroupTree::LayerGroupTree()
 
 LayerGroupTree::~LayerGroupTree()
 {
-	sinfg::info("LayerGroupTree::~LayerGroupTree(): deleted");
+	synfig::info("LayerGroupTree::~LayerGroupTree(): deleted");
 }
 
 void
@@ -150,13 +151,13 @@ LayerGroupTree::set_editable(bool x)
 }
 /*
 void
-LayerGroupTree::on_edited_time(const Glib::ustring&path_string,sinfg::Time time)
+LayerGroupTree::on_edited_time(const Glib::ustring&path_string,synfig::Time time)
 {
 	Gtk::TreePath path(path_string);
 	
 	const Gtk::TreeRow row(*(get_model()->get_iter(path)));
 	
-	sinfg::Keyframe keyframe(row[model.keyframe]);
+	synfig::Keyframe keyframe(row[model.keyframe]);
 	if(time!=keyframe.get_time())
 	{
 		row[model.time]=time;
@@ -167,7 +168,7 @@ LayerGroupTree::on_edited_time(const Glib::ustring&path_string,sinfg::Time time)
 }
 
 void
-LayerGroupTree::on_edited_time_delta(const Glib::ustring&path_string,sinfg::Time time)
+LayerGroupTree::on_edited_time_delta(const Glib::ustring&path_string,synfig::Time time)
 {
 	Gtk::TreePath path(path_string);
 	
@@ -183,8 +184,8 @@ LayerGroupTree::on_edited_description(const Glib::ustring&path_string,const Glib
 	
 	const Gtk::TreeRow row = *(get_model()->get_iter(path));
 	
-	const sinfg::String description(desc);
-	sinfg::Keyframe keyframe(row[model.keyframe]);
+	const synfig::String description(desc);
+	synfig::Keyframe keyframe(row[model.keyframe]);
 	if(description!=keyframe.get_description())
 	{
 		row[model.description]=desc;
@@ -264,22 +265,22 @@ LayerGroupTree::on_event(GdkEvent *event)
 	//return false;
 }
 
-static inline void __group_grabber(const Gtk::TreeModel::iterator& iter, std::list<sinfg::String>* ret)
+static inline void __group_grabber(const Gtk::TreeModel::iterator& iter, std::list<synfig::String>* ret)
 {
 	const LayerGroupTreeStore::Model model;
 	if((bool)(*iter)[model.is_group])
 		ret->push_back((Glib::ustring)(*iter)[model.group_name]);
 }
 
-std::list<sinfg::String>
+std::list<synfig::String>
 LayerGroupTree::get_selected_groups()const
 {
 	Glib::RefPtr<Gtk::TreeSelection> selection=const_cast<LayerGroupTree&>(*this).get_selection();
 
 	if(!selection)
-		return std::list<sinfg::String>();
+		return std::list<synfig::String>();
 
-	std::list<sinfg::String> ret;
+	std::list<synfig::String> ret;
 
 	selection->selected_foreach_iter(
 		sigc::bind(