X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.h;h=82cd32dfc9660ffd652a0e094f9c7275700bf715;hb=fe852ad9c0a418d34cc1356b30c6fb146d189ad9;hp=652bf7aff54351797fea70d962a79b1a12bc3355;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.h b/synfig-core/trunk/src/synfig/layer_pastecanvas.h
index 652bf7a..82cd32d 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.h
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file layer_pastecanvas.h
 **	\brief Template Header
 **
-**	$Id: layer_pastecanvas.h,v 1.2 2005/01/24 03:08:18 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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_LAYER_PASTEIMAGE_H
-#define __SINFG_LAYER_PASTEIMAGE_H
+#ifndef __SYNFIG_LAYER_PASTEIMAGE_H
+#define __SYNFIG_LAYER_PASTEIMAGE_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -41,16 +42,16 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
-	
+namespace synfig {
+
 class Layer_PasteCanvas : public Layer_Composite, public Layer_NoDeform
 {
-	SINFG_LAYER_MODULE_EXT
+	SYNFIG_LAYER_MODULE_EXT
 private:
 
 	Vector origin;
 
-	etl::loose_handle<sinfg::Canvas> canvas;
+	etl::loose_handle<synfig::Canvas> canvas;
 
 	//! Recursion depth counter
 	mutable int depth;
@@ -61,10 +62,10 @@ private:
 
 	mutable Time curr_time;
 
-	bool optimize_layers(sinfg::Context context,sinfg::CanvasBase&)const;
+	bool optimize_layers(synfig::Context context,synfig::CanvasBase&)const;
 
 	bool do_not_muck_with_time_;
-	
+
 	bool children_lock;
 
 	mutable Rect bounds;
@@ -76,9 +77,9 @@ public:
 
 	void set_do_not_muck_with_time(bool x=true) { do_not_muck_with_time_=true; }
 
-	etl::handle<sinfg::Canvas> get_sub_canvas()const { return canvas; }
-	void set_sub_canvas(etl::handle<sinfg::Canvas> x);
-	
+	etl::handle<synfig::Canvas> get_sub_canvas()const { return canvas; }
+	void set_sub_canvas(etl::handle<synfig::Canvas> x);
+
 	Real get_zoom()const { return zoom; }
 
 	Time get_time_offset()const { return time_offset; }
@@ -89,8 +90,8 @@ public:
 	virtual ~Layer_PasteCanvas();
 
 	virtual String get_local_name()const;
-	
-	virtual bool set_param(const String & param, const sinfg::ValueBase &value);
+
+	virtual bool set_param(const String & param, const synfig::ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
 
@@ -102,16 +103,16 @@ public:
 
 	virtual Vocab get_param_vocab()const;
 
-	virtual sinfg::Rect get_bounding_rect()const;
+	virtual synfig::Rect get_bounding_rect()const;
+
+	virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 
-	virtual sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const;
-	
 protected:
-	virtual void get_times_vfunc(Node::time_set &set) const;	
+	virtual void get_times_vfunc(Node::time_set &set) const;
 
 }; // END of class Layer_PasteCanvas
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */