Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / general.h

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index 2af68c5..639eb51 100644 (file)
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,54 +1,62 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file general.h
-**     \brief General macros, classes, and prodecure declarations
+**     \brief General macros, classes, and procedure declarations
 **
-**     $Id: general.h,v 1.1.1.1 2005/01/04 01:23:14 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_GENERAL_H
-#define __SINFG_GENERAL_H
+#ifndef __SYNFIG_GENERAL_H
+#define __SYNFIG_GENERAL_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <ETL/stringf>
 #include "string.h"
 #include "version.h"
+#ifdef ENABLE_NLS
+ #include <locale.h>
+ #include <libintl.h>
+#endif
 
 /* === M A C R O S ========================================================= */
 
-// Quick hack to keep stuff working until gettext support is added
-#ifndef _
-#define _(x)           (x)
-#define N_(x)          (x)
-//#define gettext(x)   (x)
+#ifdef ENABLE_NLS
+#define _(x) dgettext("synfig",x)
+#define gettext_noop(x) x
+#define N_(x) gettext_noop(x)
+#else
+#define dgettext(a,x) (x)
+#define _(x) (x)
+#define N_(x) (x)
 #endif
 
-#define SINFG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC"
+#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
 
 
 #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 +66,20 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
+
+class ChangeLocale {
+    const String previous;
+    const int category;
+public:
+    ChangeLocale(int category, const char *locale):
+        previous(setlocale(category,locale)),category(category)
+    {
+    }
+    ~ChangeLocale() {
+        setlocale(category,previous.c_str());
+    }
+};
 
 /*!    \class ProgressCallback
 **     \todo writeme
@@ -68,11 +89,11 @@ class ProgressCallback
 public:
 
        virtual ~ProgressCallback() { }
-       virtual bool task(const String &task) { return true; }
-       virtual bool error(const String &task) { return true; }
-       virtual bool warning(const String &task) { return true; }
-       virtual bool amount_complete(int current, int total) { return true; }
-       
+       virtual bool task(const String &/*task*/) { return true; }
+       virtual bool error(const String &/*task*/) { return true; }
+       virtual bool warning(const String &/*task*/) { return true; }
+       virtual bool amount_complete(int /*current*/, int /*total*/) { return true; }
+
        virtual bool valid() const { return true; }
 };
 
@@ -100,30 +121,17 @@ public:
        virtual bool error(const String &task) { if(cb)return cb->error(task); return true; }
        virtual bool warning(const String &task) { if(cb)return cb->warning(task); return true; }
        virtual bool amount_complete(int cur, int total) { if(cb)return cb->amount_complete(start+cur*w/total,tot); return true; }
-       
+
        virtual bool valid() const { return cb != 0; }
 };
 
-/*! \class SoftwareExpired
-**     \brief This class is thrown when the software timeout has been reached.
-*/
-class SoftwareExpired
-{
-}; // END of class SoftwareExpired
-
-
-#ifdef DEATH_TIME
-inline void CHECK_EXPIRE_TIME() { if(time(0)>DEATH_TIME) throw SoftwareExpired(); }
-#else
-#define CHECK_EXPIRE_TIME() while(0){ }
-#endif
 
 /*
 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 +149,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 =============================================================== */