Fix Qt dep warn and remove XLFD font workaround

[features.git] / src / frontends / qt / GuiFontLoader.cpp

diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp
index 9ea8e1837b8cdbcd2c0496d8567a4ef632b22601..c6c0ecbcd34ed3439bfb675bf3ec3efc47113ece 100644 (file)
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -126,17 +126,6 @@ GuiFontInfo & fontinfo(FontInfo const & f)
 }
 
 
-QString rawName(QString const & family)
-{
-       for (size_t i = 0; i < nr_symbol_fonts; ++i)
-               if (family == symbol_fonts[i].family)
-                       return symbol_fonts[i].xlfd;
-
-       LYXERR(Debug::FONT, "BUG: family not found !");
-       return QString();
-}
-
-
 QString symbolFamily(FontFamily family)
 {
        for (size_t i = 0; i < nr_symbol_fonts; ++i) {
@@ -215,11 +204,8 @@ QFont symbolFont(QString const & family, bool * ok)
                return font;
        }
 
-       // A simple setFamily() fails on Qt 2
-
-       QString const raw = rawName(family);
-       LYXERR(Debug::FONT, "Trying " << raw << " ... ");
-       font.setRawName(raw);
+       LYXERR(Debug::FONT, "Trying " << family << " ... ");
+       font.setFamily(family);
 
        if (isChosenFont(font, family, QString())) {
                LYXERR(Debug::FONT, "raw version!");
@@ -359,8 +345,6 @@ QFont makeQFont(FontInfo const & f)
        else
                LYXERR(Debug::FONT, "This font is NOT an exact match");
 
-       LYXERR(Debug::FONT, "XFLD: " << font.rawName());
-
        font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0);
 
        LYXERR(Debug::FONT, "The font has size: " << font.pointSizeF());