Since the last change will require a recompilation of pretty much everything, I took...

[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 b6069a9..38b4565 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
@@ -63,16 +63,15 @@
 namespace synfig {
 
 class ChangeLocale {
-    const char *previous;
-    int category;
+    const String previous;
+    const int category;
 public:
     ChangeLocale(int category, const char *locale):
-        previous(setlocale(category,NULL)),category(category)
+        previous(setlocale(category,locale)),category(category)
     {
-            setlocale(category,locale);
     }
     ~ChangeLocale() {
-        setlocale(category,previous);
+        setlocale(category,previous.c_str());
     }
 };
 
@@ -84,11 +83,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; }
 };
 
@@ -116,7 +115,7 @@ 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; }
 };