Improve doxygen output.

[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 43e768d..238f78e 100644 (file)
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file general.h
-**     \brief General macros, classes, and prodecure declarations
+**     \brief General macros, classes, and procedure declarations
 **
 **     $Id$
 **
@@ -31,15 +31,13 @@
 #include "string.h"
 #include "version.h"
 #include <locale.h>
+#include <libintl.h>
 
 /* === 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)
-#endif
+#define _(x) dgettext("synfig",x)
+#define gettext_noop(x) x
+#define N_(x) gettext_noop(x)
 
 #define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
 
@@ -83,10 +81,10 @@ 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; }
 };