X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fbooleancurve.cpp;h=d7b87db456e9e4ba69462b34318a94d889da1d19;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=eb6f76b57bd520248d814b1d29dfbda0aeba19b0;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp
index eb6f76b..d7b87db 100644
--- a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!	\file boolean_curve.cpp
+/* === S Y N F I G ========================================================= */
+/*!	\file booleancurve.cpp
 **	\brief Boolean Curve Implementation File
 **
-**	$Id: booleancurve.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\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
 */
 /* ========================================================================= */
@@ -30,14 +31,14 @@
 
 #include "booleancurve.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>
 
 #endif
 
@@ -45,7 +46,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -65,56 +66,56 @@ BooleanCurve::~BooleanCurve()
 {
 }
 
-bool BooleanCurve::set_param(const String & param, const sinfg::ValueBase &value)
-{	
-	if(param=="regions" && value.same_as(regions)) 
+bool BooleanCurve::set_param(const String & param, const synfig::ValueBase &value)
+{
+	if(param=="regions" && value.same_type_as(regions))
 	{
 		vector<BLinePoint> bv;
 		int size = value.get_list().size();
-		
+
 		const vector<ValueBase> &vlist = value.get_list();
-		
-		regions.clear();		
+
+		regions.clear();
 		for(int i = 0; i < size; ++i)
 		{
 			regions.push_back(vector<BLinePoint>(vlist[i].get_list().begin(),vlist[i].get_list().end()));
 		}
 		return true;
 	}
-	
+
 	return Layer_Shape::set_param(param,value);
 }
 
 ValueBase BooleanCurve::get_param(const String & param)const
 {
 	EXPORT(regions);
-	
+
 	EXPORT_NAME();
 	EXPORT_VERSION();
-	
+
 	return Layer_Shape::get_param(param);
 }
 
 Layer::Vocab BooleanCurve::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Shape::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("regions")
 		.set_local_name(_("Region Set"))
 		.set_description(_("Set of regions to combine"))
 	);
-	
+
 	return ret;
 }
 
-Color BooleanCurve::get_color(Context context, const Point &pos)const
+Color BooleanCurve::get_color(Context /*context*/, const Point &/*pos*/)const
 {
 	Color c(Color::alpha());
-	
+
 	return c;
 }
 
-bool BooleanCurve::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
+bool BooleanCurve::accelerated_render(Context /*context*/,Surface */*surface*/,int /*quality*/, const RendDesc &/*renddesc*/, ProgressCallback */*cb*/)const
 {
 	return false;
 }