X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.h;h=ec682bd02008448445abf0eb5074dfaca100dac2;hb=e7e1794959f6b4af0d60d69b5501adcd305f2207;hp=923e8f314011465afeb1606532eb7489a685453a;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer.h b/synfig-core/trunk/src/synfig/layer.h
index 923e8f3..ec682bd 100644
--- a/synfig-core/trunk/src/synfig/layer.h
+++ b/synfig-core/trunk/src/synfig/layer.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file layer.h
 **	\brief Layer Class Header
 **
 **	$Id: layer.h,v 1.2 2005/01/24 03:08:18 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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_LAYER_H
-#define __SINFG_LAYER_H
+#ifndef __SYNFIG_LAYER_H
+#define __SYNFIG_LAYER_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -40,25 +41,25 @@
 /* === M A C R O S ========================================================= */
 
 //! \writeme
-#define SINFG_LAYER_MODULE_EXT public: static const char name__[], version__[], cvs_id__[], local_name__[], category__[]; static Layer *create();
+#define SYNFIG_LAYER_MODULE_EXT public: static const char name__[], version__[], cvs_id__[], local_name__[], category__[]; static Layer *create();
 
 //! Sets the name of the layer
-#define SINFG_LAYER_SET_NAME(class,x) const char class::name__[]=x
+#define SYNFIG_LAYER_SET_NAME(class,x) const char class::name__[]=x
 
 //! Sets the local name of the layer
-#define SINFG_LAYER_SET_LOCAL_NAME(class,x) const char class::local_name__[]=x;
+#define SYNFIG_LAYER_SET_LOCAL_NAME(class,x) const char class::local_name__[]=x;
 
 //! Sets the categpru of the layer
-#define SINFG_LAYER_SET_CATEGORY(class,x) const char class::category__[]=x
+#define SYNFIG_LAYER_SET_CATEGORY(class,x) const char class::category__[]=x
 
 //! Sets the version string for the layer
-#define SINFG_LAYER_SET_VERSION(class,x) const char class::version__[]=x
+#define SYNFIG_LAYER_SET_VERSION(class,x) const char class::version__[]=x
 
 //! Sets the CVS ID string for the layer
-#define SINFG_LAYER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
+#define SYNFIG_LAYER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
 
 //! \writeme
-#define SINFG_LAYER_INIT(class) sinfg::Layer* class::create() { return new class(); }
+#define SYNFIG_LAYER_INIT(class) synfig::Layer* class::create() { return new class(); }
 
 //! \writeme
 #define IMPORT_PLUS(x,y) if(param==#x && value.same_as(x)) { value.put(&x);{y;}return true;}
@@ -85,7 +86,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class Canvas;
 class Vector;
@@ -300,7 +301,7 @@ public:
 	float get_z_depth()const { return z_depth_; }
 
 	//! \writeme
-	float get_z_depth(const sinfg::Time& t)const;
+	float get_z_depth(const synfig::Time& t)const;
 
 	//! \writeme
 	void set_z_depth(float x) { z_depth_=x; }
@@ -445,7 +446,7 @@ public:
 
 }; // END of class Layer
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 
 /* === E N D =============================================================== */