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 9dc0059..639eb51 100644 (file)
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,8 +1,8 @@
 /* === 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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -30,15 +30,21 @@
 #include <ETL/stringf>
 #include "string.h"
 #include "version.h"
-#include <locale.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 SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
@@ -83,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; }
 };
 
@@ -115,23 +121,10 @@ 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);