X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdebug.C;h=24977bc1b88a17dfe5eb83a8a822fa603d839345;hb=e7ef29fa2d516b8593aa3cccb6548de5686e8a9a;hp=6065bec95f5caeb1199123bc94c7cff04bdb1ee7;hpb=8d098dcb5633aa660c056cd9f08d7f8f868160e8;p=lyx.git

diff --git a/src/debug.C b/src/debug.C
index 6065bec95f..24977bc1b8 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -14,6 +14,7 @@
 #include "debug.h"
 #include "gettext.h"
 
+#include "support/convert.h"
 #include "support/lstrings.h"
 
 #include <iostream>
@@ -22,10 +23,9 @@
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
 using lyx::support::isStrInt;
-using lyx::support::strToInt;
 
 using std::setw;
-
+using std::string;
 using std::ostream;
 
 namespace {
@@ -63,6 +63,7 @@ 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::ANY,       "any",       N_("All debugging messages")}
 };
 
@@ -77,13 +78,13 @@ lyx_debug_trait::type lyx_debug_trait::value(string const & val)
 	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)
@@ -108,19 +109,21 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
 			// avoid _(...) re-entrance problem
 			string const s = _(errorTags[i].desc);
 			os << bformat(_("Debugging `%1$s' (%2$s)"),
-					errorTags[i].name, s);
+					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
+		os << setw(7) << static_cast<unsigned int>(errorTags[i].level)
 		   << setw(10) << errorTags[i].name
 		   << "  " << _(errorTags[i].desc) << '\n';
 	os.flush();
 }
 
-LyXErr lyxerr(std::cerr.rdbuf());
+LyXErr lyxerr;