Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / example / simplecircle.cpp

diff --git a/synfig-core/trunk/src/modules/example/simplecircle.cpp b/synfig-core/trunk/src/modules/example/simplecircle.cpp
index 780cde2..e2eb896 100644 (file)
--- a/synfig-core/trunk/src/modules/example/simplecircle.cpp
+++ b/synfig-core/trunk/src/modules/example/simplecircle.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
-/*!    \file layer_solidcolor.cpp
-**     \brief Template Header
+/* === S Y N F I G ========================================================= */
+/*!    \file simplecircle.cpp
+**     \brief Implementation of the "Simple Circle" layer
 **
-**     $Id: simplecircle.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
-**     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,14 +30,14 @@
 #      include <config.h>
 #endif
 
-#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 "simplecircle.h"
 
@@ -45,16 +47,16 @@
 
 using namespace etl;
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(SimpleCircle);
-SINFG_LAYER_SET_NAME(SimpleCircle,"simple_circle");
-SINFG_LAYER_SET_LOCAL_NAME(SimpleCircle,_("Simple Circle"));
-SINFG_LAYER_SET_CATEGORY(SimpleCircle,_("Do Not Use"));
-SINFG_LAYER_SET_VERSION(SimpleCircle,"0.1");
-SINFG_LAYER_SET_CVS_ID(SimpleCircle,"$Id: simplecircle.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $");
+SYNFIG_LAYER_INIT(SimpleCircle);
+SYNFIG_LAYER_SET_NAME(SimpleCircle,"simple_circle");
+SYNFIG_LAYER_SET_LOCAL_NAME(SimpleCircle,N_("Simple Circle"));
+SYNFIG_LAYER_SET_CATEGORY(SimpleCircle,N_("Example"));
+SYNFIG_LAYER_SET_VERSION(SimpleCircle,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(SimpleCircle,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -69,14 +71,14 @@ SimpleCircle::SimpleCircle():
        radius(0.5)
 {
 }
-       
+
 bool
 SimpleCircle::set_param(const String & param, const ValueBase &value)
 {
        IMPORT(color);
        IMPORT(center);
        IMPORT(radius);
-       
+
        return Layer_Composite::set_param(param,value);
 }
 
@@ -89,15 +91,15 @@ SimpleCircle::get_param(const String &param)const
 
        EXPORT_NAME();
        EXPORT_VERSION();
-               
-       return Layer_Composite::get_param(param);       
+
+       return Layer_Composite::get_param(param);
 }
 
 Layer::Vocab
 SimpleCircle::get_param_vocab()const
 {
        Layer::Vocab ret(Layer_Composite::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("color")
                .set_local_name(_("Color"))
        );
@@ -105,13 +107,13 @@ SimpleCircle::get_param_vocab()const
        ret.push_back(ParamDesc("center")
                .set_local_name(_("Center"))
        );
-       
+
        ret.push_back(ParamDesc("radius")
                .set_local_name(_("Radius"))
                .set_description(_("This is the radius of the circle"))
                .set_origin("center")
        );
-       
+
        return ret;
 }
 
@@ -130,8 +132,8 @@ SimpleCircle::get_color(Context context, const Point &pos)const
                return context.get_color(pos);
 }
 
-sinfg::Layer::Handle
-SimpleCircle::hit_check(sinfg::Context context, const sinfg::Point &pos)const
+synfig::Layer::Handle
+SimpleCircle::hit_check(synfig::Context context, const synfig::Point &pos)const
 {
        if((pos-center).mag()<radius)
                return const_cast<SimpleCircle*>(this);
@@ -148,7 +150,7 @@ SimpleCircle::accelerated_render(Context context,Surface *surface,int quality, c
                // Mark our progress as starting
                if(cb && !cb->amount_complete(0,1000))
                        return false;
-               
+
                surface->set_wh(renddesc.get_w(),renddesc.get_h());
                surface->fill(color);