X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdebug.C;h=bbf67f0fe52f35b20d7b6a4a5ed5b649c599a250;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=75852f61d9730fe59f7e900152a419c17fba3930;hpb=342cdf432246110db37bee4e0aebb4b72c933ddb;p=lyx.git

diff --git a/src/debug.C b/src/debug.C
index 75852f61d9..bbf67f0fe5 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -20,9 +20,12 @@
 #include <iostream>
 #include <iomanip>
 
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::isStrInt;
+
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::isStrInt;
 
 using std::setw;
 using std::string;
@@ -63,7 +66,8 @@ error_item errorTags[] = {
 	{ Debug::GRAPHICS,  "graphics",  N_("Graphics conversion and loading")},
 	{ Debug::CHANGES,   "changes",   N_("Change tracking")},
 	{ Debug::EXTERNAL,  "external",  N_("External template/inset messages")},
-	{ Debug::DEBUG,  "debug",  N_("Developers general debug messages")},
+	{ Debug::PAINTING,  "painting",  N_("RowPainter profiling")},
+	{ Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
 	{ Debug::ANY,       "any",       N_("All debugging messages")}
 };
 
@@ -106,10 +110,10 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
 		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';
 		}
 	}
@@ -120,10 +124,14 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
 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';
+		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;
+
+
+} // namespace lyx