X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fregion.cpp;h=87d6052294511228f43ec2751e1568a109e1956d;hb=a08fceee694fe4adf35a99f968f42fc84c27dd20;hp=deb7b6628040bdc5d8a8a90d3be0d8abc44a9541;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/region.cpp b/synfig-core/trunk/src/modules/mod_geometry/region.cpp
index deb7b66..87d6052 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/region.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/region.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** Template File
 ** $Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -32,16 +33,16 @@
 #include <ETL/bezier>
 #include <ETL/hermite>
 
-#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 <sinfg/segment.h>
-#include <sinfg/valuenode_bline.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 <synfig/segment.h>
+#include <synfig/valuenode_bline.h>
 
 #endif
 
@@ -53,12 +54,12 @@ using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Region);
-SINFG_LAYER_SET_NAME(Region,"region");
-SINFG_LAYER_SET_LOCAL_NAME(Region,_("Region"));
-SINFG_LAYER_SET_CATEGORY(Region,_("Geometry"));
-SINFG_LAYER_SET_VERSION(Region,"0.1");
-SINFG_LAYER_SET_CVS_ID(Region,"$Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(Region);
+SYNFIG_LAYER_SET_NAME(Region,"region");
+SYNFIG_LAYER_SET_LOCAL_NAME(Region,_("Region"));
+SYNFIG_LAYER_SET_CATEGORY(Region,_("Geometry"));
+SYNFIG_LAYER_SET_VERSION(Region,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Region,"$Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -94,14 +95,14 @@ Region::sync()
 	}
 	else
 	{
-		sinfg::warning("Region: incorrect type on bline, layer disabled");
+		synfig::warning("Region: incorrect type on bline, layer disabled");
 		clear();
 		return;
 	}
 
 	if(segment_list.empty())
 	{
-		sinfg::warning("Region: segment_list is empty, layer disabled");
+		synfig::warning("Region: segment_list is empty, layer disabled");
 		clear();
 		return;
 	}
@@ -175,10 +176,10 @@ Region::set_param(const String & param, const ValueBase &value)
 		{
 			connect_dynamic_param("bline",dynamic_param_list().find("segment_list")->second);
 			disconnect_dynamic_param("segment_list");
-			sinfg::warning("Region::set_param(): Updated valuenode connection to use the new \"bline\" parameter.");
+			synfig::warning("Region::set_param(): Updated valuenode connection to use the new \"bline\" parameter.");
 		}
 		else
-			sinfg::warning("Region::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead.");
+			synfig::warning("Region::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead.");
 	}
 	
 	if(	(param=="segment_list" || param=="bline") && value.get_type()==ValueBase::TYPE_LIST)