X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduck.cpp;h=8b98d562c17245addd9aa06d6b7ab55a6dcacc2e;hb=6f28bee2a11612b1b1ece247dd4914dab4931a30;hp=f540c3da565f9540c1955ce13f851d8bcaac105a;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duck.cpp b/synfig-studio/trunk/src/gtkmm/duck.cpp
index f540c3d..8b98d56 100644
--- a/synfig-studio/trunk/src/gtkmm/duck.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duck.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file duck.cpp
 **	\brief Template File
 **
 **	$Id: duck.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
 */
 /* ========================================================================= */
@@ -36,7 +37,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -51,7 +52,7 @@ struct _DuckCounter
 	~_DuckCounter()
 	{
 		if(counter)
-			sinfg::error("%d ducks not yet deleted!",counter);
+			synfig::error("%d ducks not yet deleted!",counter);
 	}
 } _duck_counter;
 
@@ -70,7 +71,7 @@ Duck::Duck():
 	tangent_(false)
 { duck_count++; _DuckCounter::counter++; }
 
-Duck::Duck(const sinfg::Point &point):
+Duck::Duck(const synfig::Point &point):
 	type_(TYPE_NONE),
 	point(point),
 	origin(0,0),
@@ -81,7 +82,7 @@ Duck::Duck(const sinfg::Point &point):
 	tangent_(false)
 { duck_count++; _DuckCounter::counter++;}
 
-Duck::Duck(const sinfg::Point &point,const sinfg::Point &origin):
+Duck::Duck(const synfig::Point &point,const synfig::Point &origin):
 	point(point),
 	origin(origin),
 	scalar(1),
@@ -93,7 +94,7 @@ Duck::Duck(const sinfg::Point &point,const sinfg::Point &origin):
 
 Duck::~Duck() { duck_count--; _DuckCounter::counter--;}
 
-sinfg::GUID
+synfig::GUID
 Duck::get_data_guid()const
 {
 	if(value_desc_.is_value_node())
@@ -102,7 +103,7 @@ Duck::get_data_guid()const
 }
 
 void
-Duck::set_name(const sinfg::String &x)
+Duck::set_name(const synfig::String &x)
 {
 	name=x;
 	if(guid_==GUID::zero())
@@ -127,21 +128,21 @@ Duck::operator==(const Duck &rhs)const
 		//(shared_point?*shared_point==*rhs.shared_point:point==rhs.point) ;
 }
 
-sinfg::Point
+synfig::Point
 Duck::get_trans_point()const
 {
 	return transform_stack_.perform(get_sub_trans_point());
 }
 	
 void
-Duck::set_trans_point(const sinfg::Point &x)
+Duck::set_trans_point(const synfig::Point &x)
 {
 	set_sub_trans_point(transform_stack_.unperform(x));
 }
 
 //! Sets the origin point.
 void
-Duck::set_origin(const sinfg::Point &x)
+Duck::set_origin(const synfig::Point &x)
 {
 	origin=x; origin_duck=0;
 }
@@ -154,7 +155,7 @@ Duck::set_origin(const etl::handle<Duck> &x)
 }
 
 //! Retrieves the origin location
-sinfg::Point
+synfig::Point
 Duck::get_origin()const
 {
 	return origin_duck?origin_duck->get_point():origin;
@@ -168,25 +169,25 @@ Duck::get_origin_duck() const
 }
 
 //! Retrieves the origin location
-sinfg::Point
+synfig::Point
 Duck::get_trans_origin()const
 {
 	return transform_stack_.perform(get_sub_trans_origin());
 }
 
-sinfg::Point
+synfig::Point
 Duck::get_sub_trans_point()const
 {
 	return get_point()*get_scalar()+get_sub_trans_origin();
 }
 
 void
-Duck::set_sub_trans_point(const sinfg::Point &x)
+Duck::set_sub_trans_point(const synfig::Point &x)
 {
 	set_point((x-get_sub_trans_origin())/get_scalar());
 }
 
-sinfg::Point
+synfig::Point
 Duck::get_sub_trans_origin()const
 {
 	return origin_duck?origin_duck->get_sub_trans_point():origin;