cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / debug.C

diff --git a/src/debug.C b/src/debug.C
index f27ee939422c2c270616a64b44d90b84e16a720c..6f3e594d8aa11051420f27444280490ea049b5a9 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <iomanip>
 
+using lyx::docstring;
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
 using lyx::support::isStrInt;
@@ -108,9 +109,9 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
                    && errorTags[i].level != Debug::NONE
                    && errorTags[i].level & level) {
                        // avoid lyx::to_utf8(_(...)) re-entrance problem
-                       string const s = lyx::to_utf8(_(errorTags[i].desc));
-                       os << bformat(lyx::to_utf8(_("Debugging `%1$s' (%2$s)")),
-                                       errorTags[i].name, s)
+                       docstring const s = _(errorTags[i].desc);
+                       os << lyx::to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
+                                       lyx::from_utf8(errorTags[i].name), s))
                           << '\n';
                }
        }
@@ -127,4 +128,5 @@ void lyx_debug_trait::showTags(ostream & os)
        os.flush();
 }
 
+
 LyXErr lyxerr;