X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.h;h=9a0e2ab6f92e983d4cacad7a0902849b47196307;hb=4c003ac49046e06b6d9a31b38707f921830ea41b;hp=8bd540e4fee9c712195ab9b99fb1398ddfa6af3c;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.h b/synfig-core/trunk/src/synfig/canvas.h
index 8bd540e..9a0e2ab 100644
--- a/synfig-core/trunk/src/synfig/canvas.h
+++ b/synfig-core/trunk/src/synfig/canvas.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file canvas.h
 **	\brief Canvas Class Implementation
 **
 **	$Id: canvas.h,v 1.1.1.1 2005/01/04 01:23:14 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_CANVAS_H
-#define __SINFG_CANVAS_H
+#ifndef __SYNFIG_CANVAS_H
+#define __SYNFIG_CANVAS_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -46,7 +47,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class Context;
 class GUID;
@@ -67,7 +68,7 @@ public:
 
 	typedef std::list<Handle> Children;
 
-	friend void sinfg::optimize_layers(Context, Canvas::Handle);
+	friend void synfig::optimize_layers(Context, Canvas::Handle);
 
 	/*
  --	** -- D A T A -------------------------------------------------------------
@@ -155,8 +156,8 @@ private:
 	//! Group Changed
 	sigc::signal<void,String> signal_group_changed_;	
 
-	sigc::signal<void,String,etl::handle<sinfg::Layer> > signal_group_pair_added_;
-	sigc::signal<void,String,etl::handle<sinfg::Layer> > signal_group_pair_removed_;
+	sigc::signal<void,String,etl::handle<synfig::Layer> > signal_group_pair_added_;
+	sigc::signal<void,String,etl::handle<synfig::Layer> > signal_group_pair_removed_;
 
 	//!	Layers Reordered
 	sigc::signal<void,int*> signal_layers_reordered_;	
@@ -193,8 +194,8 @@ private:
 
 public:
 
-	sigc::signal<void,String,etl::handle<sinfg::Layer> >& signal_group_pair_added() { return signal_group_pair_added_; }
-	sigc::signal<void,String,etl::handle<sinfg::Layer> >& signal_group_pair_removed() { return signal_group_pair_removed_; }
+	sigc::signal<void,String,etl::handle<synfig::Layer> >& signal_group_pair_added() { return signal_group_pair_added_; }
+	sigc::signal<void,String,etl::handle<synfig::Layer> >& signal_group_pair_removed() { return signal_group_pair_removed_; }
 
 	//!	Group Added
 	sigc::signal<void,String>& signal_group_added() { return signal_group_added_; }
@@ -477,7 +478,7 @@ protected:
 void optimize_layers(Context context, Canvas::Handle op_canvas);
 
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */