X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgeneral.h;h=7e8f0e35344dc9c192f1b4b3215cb843e6389010;hb=4c003ac49046e06b6d9a31b38707f921830ea41b;hp=2af68c5e0412f9803ab945d988260185459e10b0;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index 2af68c5..7e8f0e3 100644
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file general.h
 **	\brief General macros, classes, and prodecure declarations
 **
 **	$Id: general.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_GENERAL_H
-#define __SINFG_GENERAL_H
+#ifndef __SYNFIG_GENERAL_H
+#define __SYNFIG_GENERAL_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -39,16 +40,16 @@
 //#define gettext(x)	(x)
 #endif
 
-#define SINFG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC"
+#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC"
 
 
 #ifdef _DEBUG
 #ifdef __FUNC__
-#define DEBUGPOINT()	sinfg::warning(etl::strprintf(__FILE__":"__FUNC__":%d DEBUGPOINT",__LINE__))
-#define DEBUGINFO(x)	sinfg::warning(etl::strprintf(__FILE__":"__FUNC__":%d:DEBUGINFO:",__LINE__)+x)
+#define DEBUGPOINT()	synfig::warning(etl::strprintf(__FILE__":"__FUNC__":%d DEBUGPOINT",__LINE__))
+#define DEBUGINFO(x)	synfig::warning(etl::strprintf(__FILE__":"__FUNC__":%d:DEBUGINFO:",__LINE__)+x)
 #else
-#define DEBUGPOINT()	sinfg::warning(etl::strprintf(__FILE__":%d DEBUGPOINT",__LINE__))
-#define DEBUGINFO(x)	sinfg::warning(etl::strprintf(__FILE__":%d:DEBUGINFO:",__LINE__)+x)
+#define DEBUGPOINT()	synfig::warning(etl::strprintf(__FILE__":%d DEBUGPOINT",__LINE__))
+#define DEBUGINFO(x)	synfig::warning(etl::strprintf(__FILE__":%d:DEBUGINFO:",__LINE__)+x)
 #endif
 
 #else
@@ -58,7 +59,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 /*!	\class ProgressCallback
 **	\todo writeme
@@ -123,7 +124,7 @@ extern bool add_to_module_search_path(const std:string &path);
 extern bool add_to_config_search_path(const std:string &path);
 */
 
-//! Shutdown the sinfg environment
+//! Shutdown the synfig environment
 extern void shutdown();
 
 //! Reports an error
@@ -141,7 +142,7 @@ extern void warning(const String &str);
 extern void info(const char *format,...);
 extern void info(const String &str);
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */