Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / lyr_std / insideout.h

diff --git a/synfig-core/tags/stable/src/modules/lyr_std/insideout.h b/synfig-core/tags/stable/src/modules/lyr_std/insideout.h
index d61dee6..9cae33b 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_std/insideout.h
+++ b/synfig-core/tags/stable/src/modules/lyr_std/insideout.h
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** Template Header File
-** $Id: insideout.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file insideout.h
+**     \brief Header file for implementation of the "Inside Out" layer
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** 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 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.
+**
+**     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
 **
 ** === N O T E S ===========================================================
 **
@@ -20,14 +24,14 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_INSIDEOUT_H
-#define __SINFG_INSIDEOUT_H
+#ifndef __SYNFIG_INSIDEOUT_H
+#define __SYNFIG_INSIDEOUT_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/layer.h>
-#include <sinfg/color.h>
-#include <sinfg/context.h>
+#include <synfig/layer.h>
+#include <synfig/color.h>
+#include <synfig/context.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -35,14 +39,14 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 class InsideOut_Trans;
 
 class InsideOut : public Layer
 {
-       SINFG_LAYER_MODULE_EXT
+       SYNFIG_LAYER_MODULE_EXT
        friend class InsideOut_Trans;
 
 private:
@@ -51,13 +55,13 @@ private:
 
 public:
        InsideOut();
-       
+
        virtual bool set_param(const String &param, const ValueBase &value);
        virtual ValueBase get_param(const String &param)const;
        virtual Color get_color(Context context, const Point &pos)const;
-       sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; 
-       virtual Vocab get_param_vocab()const;   
-       virtual etl::handle<sinfg::Transform> get_transform()const;
+       synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+       virtual Vocab get_param_vocab()const;
+       virtual etl::handle<synfig::Transform> get_transform()const;
 };
 
 /* === E N D =============================================================== */