#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;
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")}
};
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)
&& 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';
}
}
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