X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.cpp;h=0ee6e29f7e10b2f7be8bbd9a58c78aa5804518bb;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=b6918efebfaae8e5e68aaed2f56caa0aea0b9b07;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index b6918efebf..0ee6e29f7e 100644
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -16,12 +16,9 @@
 
 #include "FontInfo.h"
 
-#include "debug.h"
-
-#include <ostream>
-
-using std::endl;
+#include "support/debug.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -82,16 +79,16 @@ FontInfo & FontInfo::decSize()
 	case FONT_SIZE_SCRIPT:       size_ = FONT_SIZE_TINY;     break;
 	case FONT_SIZE_TINY:         break;
 	case FONT_SIZE_INCREASE:
-		lyxerr << "Can't FontInfo::decSize on FONT_SIZE_INCREASE" << endl;
+		LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INCREASE");
 		break;
 	case FONT_SIZE_DECREASE:
-		lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_DECREASE" << endl;
+		LYXERR0("Can't FontInfo::decSize on FONT_SIZE_DECREASE");
 		break;
 	case FONT_SIZE_INHERIT:
-		lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_INHERIT" << endl;
+		LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INHERIT");
 		break;
 	case FONT_SIZE_IGNORE:
-		lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_IGNORE" << endl;
+		LYXERR0("Can't FontInfo::decSize on FONT_SIZE_IGNORE");
 		break;
 	}
 	return *this;
@@ -113,16 +110,16 @@ FontInfo & FontInfo::incSize()
 	case FONT_SIZE_SCRIPT:       size_ = FONT_SIZE_FOOTNOTE; break;
 	case FONT_SIZE_TINY:         size_ = FONT_SIZE_SCRIPT;   break;
 	case FONT_SIZE_INCREASE:
-		lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INCREASE" << endl;
+		LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INCREASE");
 		break;
 	case FONT_SIZE_DECREASE:
-		lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_DECREASE" << endl;
+		LYXERR0("Can't FontInfo::incSize on FONT_SIZE_DECREASE");
 		break;
 	case FONT_SIZE_INHERIT:
-		lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INHERIT" << endl;
+		LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INHERIT");
 		break;
 	case FONT_SIZE_IGNORE:
-		lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_IGNORE" << endl;
+		LYXERR0("Can't FontInfo::incSize on FONT_SIZE_IGNORE");
 		break;
 	}
 	return *this;
@@ -202,8 +199,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)