#include "debug.h"
#include "gettext.h"
+#include "support/convert.h"
#include "support/lstrings.h"
#include <iostream>
#include <iomanip>
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::isStrInt;
-using lyx::support::strToInt;
+
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::isStrInt;
using std::setw;
using std::string;
{ Debug::GRAPHICS, "graphics", N_("Graphics conversion and loading")},
{ Debug::CHANGES, "changes", N_("Change tracking")},
{ Debug::EXTERNAL, "external", N_("External template/inset messages")},
+ { Debug::PAINTING, "painting", N_("RowPainter profiling")},
+ { Debug::DEBUG, "debug", N_("Developers' general debug messages")},
{ Debug::ANY, "any", N_("All debugging messages")}
};
type l = Debug::NONE;
string v(val);
while (!v.empty()) {
- string::size_type st = v.find(',');
- string tmp(ascii_lowercase(v.substr(0, st)));
+ string::size_type const st = v.find(',');
+ string const tmp(ascii_lowercase(v.substr(0, st)));
if (tmp.empty())
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)
if (errorTags[i].level != Debug::ANY
&& 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);
+ // avoid to_utf8(_(...)) re-entrance problem
+ docstring const s = _(errorTags[i].desc);
+ os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
+ from_utf8(errorTags[i].name), s))
+ << '\n';
}
}
+ os.flush();
}
void lyx_debug_trait::showTags(ostream & os)
{
for (int i = 0; i < numErrorTags ; ++i)
- os << setw(7) << errorTags[i].level
- << setw(10) << errorTags[i].name
- << " " << _(errorTags[i].desc) << '\n';
+ os << setw(10) << static_cast<unsigned int>(errorTags[i].level)
+ << setw(13) << errorTags[i].name
+ << " " << to_utf8(_(errorTags[i].desc)) << '\n';
os.flush();
}
-LyXErr lyxerr(std::cerr.rdbuf());
+
+LyXErr lyxerr;
+
+
+} // namespace lyx