X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fcircle.cpp;h=e7b2e7f81086ebd710deb15e2b6bb102a45a04d4;hb=e573bb1898bfbc7a95f77d97dd637e3502475105;hp=030d0b2f2d2e66a6686641c24cef8673a2b37241;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
index 030d0b2..e7b2e7f 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file circle.cpp
 **	\brief Template Header
 **
 **	$Id: circle.cpp,v 1.2 2005/01/24 03:08:17 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
 */
 /* ========================================================================= */
@@ -29,31 +30,31 @@
 #endif
 
 #include "circle.h"
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
 
 #include <cmath>
 
 #endif
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* -- G L O B A L S --------------------------------------------------------- */
 
-SINFG_LAYER_INIT(Circle);
-SINFG_LAYER_SET_NAME(Circle,"circle");
-SINFG_LAYER_SET_LOCAL_NAME(Circle,_("Circle"));
-SINFG_LAYER_SET_CATEGORY(Circle,_("Geometry"));
-SINFG_LAYER_SET_VERSION(Circle,"0.1");
-SINFG_LAYER_SET_CVS_ID(Circle,"$Id: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $");
+SYNFIG_LAYER_INIT(Circle);
+SYNFIG_LAYER_SET_NAME(Circle,"circle");
+SYNFIG_LAYER_SET_LOCAL_NAME(Circle,_("Circle"));
+SYNFIG_LAYER_SET_CATEGORY(Circle,_("Geometry"));
+SYNFIG_LAYER_SET_VERSION(Circle,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Circle,"$Id: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $");
 
 /* -- F U N C T I O N S ----------------------------------------------------- */
 
@@ -149,8 +150,8 @@ Circle::get_param_vocab()const
 	return ret;
 }
 
-sinfg::Layer::Handle
-Circle::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+Circle::hit_check(synfig::Context context, const synfig::Point &point)const
 {
 	Point temp=pos-point;
 
@@ -173,7 +174,7 @@ Circle::hit_check(sinfg::Context context, const sinfg::Point &point)const
 			
 	if(in_circle)
 	{
-		sinfg::Layer::Handle tmp;
+		synfig::Layer::Handle tmp;
 		if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(point)))
 			return tmp;
 		if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(point)))