Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiFontLoader.cpp

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 4839ad378d268cbd787d4cb75a2de0d966a364cb..9ea8e1837b8cdbcd2c0496d8567a4ef632b22601 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -42,9 +42,6 @@ int const num_math_fonts = sizeof(math_fonts) / sizeof(*math_fonts);
 
 namespace lyx {
 
-extern docstring const stateText(FontInfo const & f,
-                                bool const terse = false);
-
 namespace frontend {
 
 /**
@@ -97,7 +94,7 @@ fontinfo_[NUM_FAMILIES][NUM_SERIES][NUM_SHAPE][NUM_SIZE][NUM_STYLE];
 GuiFontInfo * & fontinfo_ptr(FontInfo const & f)
 {
        // The display font and the text font are the same
-       size_t const style = (f.style() == LM_ST_DISPLAY) ? LM_ST_TEXT : f.style();
+       size_t const style = (f.style() == DISPLAY_STYLE) ? TEXT_STYLE : f.style();
        return fontinfo_[f.family()][f.series()][f.realShape()][f.size()][style];
 }
 
@@ -353,7 +350,7 @@ QFont makeQFont(FontInfo const & f)
                        break;
        }
 
-       LYXERR(Debug::FONT, "Font '" << stateText(f)
+       LYXERR(Debug::FONT, "Font '" << f.stateText()
                << "' matched by\n" << font.family());
 
        // Is this an exact match?