rename LFUN enum values according to their command (as used in th minibuffer/bind...

[lyx.git] / src / frontends / qt4 / qfont_loader.C

diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C
index 8a3ce1cf95e26ab5c3069ca954f6b6778e3d8358..a822680b47fbfb229fee86f0b7a0fdfadf143582 100644 (file)
--- a/src/frontends/qt4/qfont_loader.C
+++ b/src/frontends/qt4/qfont_loader.C
@@ -35,10 +35,6 @@
 #endif
 
 using lyx::support::contains;
-using lyx::support::LibFileSearch;
-using lyx::support::OnlyPath;
-using lyx::support::QuoteName;
-using lyx::support::Systemcall;
 
 using std::endl;
 using std::make_pair;
@@ -177,7 +173,8 @@ bool isChosenFont(QFont & font, string const & family)
        }
 
        // Qt 3.2 beta1 returns "xft" for all xft fonts
-       if (font.rawName() == "xft") {
+       // Qt 4.1 returns "Multi" for all ? xft fonts
+       if (font.rawName() == "xft" || font.rawName() == "Multi") {
                if (contains(fromqstr(fi.family()), family)) {
                        lyxerr[Debug::FONT] << " got it (Xft) ";
                        return true;
@@ -238,9 +235,9 @@ FontLoader::FontLoader()
 
 void FontLoader::update()
 {
-       for (int i1 = 0; i1 < LyXFont::NUM_FAMILIES; ++i1) 
-               for (int i2 = 0; i2 < 2; ++i2) 
-                       for (int i3 = 0; i3 < 4; ++i3) 
+       for (int i1 = 0; i1 < LyXFont::NUM_FAMILIES; ++i1)
+               for (int i2 = 0; i2 < 2; ++i2)
+                       for (int i3 = 0; i3 < 4; ++i3)
                                for (int i4 = 0; i4 < 10; ++i4) {
                                        delete fontinfo_[i1][i2][i3][i4];
                                        fontinfo_[i1][i2][i3][i4] = 0;