X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.cpp;h=2623f2ea232f1eb9a0fda85a84b93a1ae2ac1a61;hb=6b651f2ad9f698c01993dcc6e340682c279f1c55;hp=7e58b16e3b4ed18a17a57195425840a875a34361;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 7e58b16e3b..2623f2ea23 100644
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -16,18 +16,11 @@
 
 #include "FontInfo.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
-using std::endl;
-using std::ostream;
-using std::ostringstream;
-using std::istringstream;
-using std::pair;
-
-#ifndef CXX_GLOBAL_CSTD
-using std::strlen;
-#endif
+#include <ostream>
 
+using namespace std;
 
 namespace lyx {
 
@@ -208,8 +201,8 @@ static FontState setMisc(FontState newfont,
 		else if (org == FONT_OFF)
 			return FONT_ON;
 		else {
-			lyxerr <<"Font::setMisc: Need state"
-				" FONT_ON or FONT_OFF to toggle. Setting to FONT_ON" << endl;
+			LYXERR0("Font::setMisc: Need state"
+				" FONT_ON or FONT_OFF to toggle. Setting to FONT_ON");
 			return FONT_ON;
 		}
 	} else if (newfont == FONT_IGNORE)
@@ -294,4 +287,4 @@ ColorCode FontInfo::realColor() const
 	return color_;
 }
 
-} // namespace lyx
\ No newline at end of file
+} // namespace lyx