Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / FontInfo.cpp

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 7e58b16e3b4ed18a17a57195425840a875a34361..0ee6e29f7e10b2f7be8bbd9a58c78aa5804518bb 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -16,18 +16,9 @@
 
 #include "FontInfo.h"
 
-#include "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 "support/debug.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -88,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;
@@ -119,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;
@@ -208,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)
@@ -294,4 +285,4 @@ ColorCode FontInfo::realColor() const
        return color_;
 }
 
-} // namespace lyx
\ No newline at end of file
+} // namespace lyx