Another compile fix. I don't understand why it worked for me.

[lyx.git] / src / client / debug.C

diff --git a/src/client/debug.C b/src/client/debug.C
index 5da41b9f67398abb4820664bd78dafcffcb5dde7..0afb657b37f85149614b312db0eef1f9fed320ac 100644 (file)
--- a/src/client/debug.C
+++ b/src/client/debug.C
@@ -14,15 +14,18 @@
 #include "debug.h"
 #include "gettext.h"
 
+#include "support/convert.h"
 #include "support/lstrings.h"
 
 #include <iostream>
 #include <iomanip>
 
+
+namespace lyx {
+
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
 using lyx::support::isStrInt;
-using lyx::support::strToInt;
 
 using std::setw;
 using std::string;
@@ -40,7 +43,7 @@ struct error_item {
 error_item errorTags[] = {
        { Debug::NONE,      "none",      N_("No debugging message")},
        { Debug::INFO,      "info",      N_("General information")},
-       { Debug::DEBUG,  "debug",  N_("Developers general debug messages")},
+       { Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
        { Debug::ANY,       "any",       N_("All debugging messages")}
 };
 
@@ -61,7 +64,7 @@ lyx_debug_trait::type lyx_debug_trait::value(string const & val)
                        break;
                // Is it a number?
                if (isStrInt(tmp))
-                       l |= static_cast<type>(strToInt(tmp));
+                       l |= static_cast<type>(convert<int>(tmp));
                else
                // Search for an explicit name
                for (int i = 0 ; i < numErrorTags ; ++i)
@@ -84,9 +87,11 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
                    && errorTags[i].level != Debug::NONE
                    && errorTags[i].level & level) {
                        // avoid _(...) re-entrance problem
-                       string const s = _(errorTags[i].desc);
-                       os << bformat(_("Debugging `%1$s' (%2$s)"),
-                                       errorTags[i].name, s)
+                       // FIXME: should we use _() from gettext.h here?
+                       lyx::docstring const s = _(errorTags[i].desc);
+                       os << lyx::to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
+                                                  lyx::from_utf8(errorTags[i].name), 
+                                                  s))
                           << '\n';
                }
        }
@@ -99,8 +104,11 @@ void lyx_debug_trait::showTags(ostream & os)
        for (int i = 0; i < numErrorTags ; ++i)
                os << setw(7) << static_cast<unsigned int>(errorTags[i].level)
                   << setw(10) << errorTags[i].name
-                  << "  " << _(errorTags[i].desc) << '\n';
+                  << "  " << lyx::to_utf8(_(errorTags[i].desc)) << '\n';
        os.flush();
 }
 
 LyXErr lyxerr;
+
+
+} // namespace lyx