QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index d61a2782dc85e4eaba8cdee712b49015aef84fbf..4f705330f9d33301d24d2dd2a5422d80b0bbd240 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -234,7 +234,7 @@ QFont symbolFont(QString const & family, bool * ok)
        return font;
 }
 
-} // namespace anon
+} // namespace
 
 
 FontLoader::FontLoader()
@@ -301,7 +301,7 @@ QFont makeQFont(FontInfo const & f)
                switch (f.family()) {
                case ROMAN_FAMILY: {
                        QString family = makeFontName(toqstr(lyxrc.roman_font_name),
-                               toqstr(lyxrc.roman_font_foundry)); 
+                               toqstr(lyxrc.roman_font_foundry));
                        font.setFamily(family);
 #ifdef Q_OS_MAC
 #if QT_VERSION >= 0x040300 //&& QT_VERSION < 0x040800
@@ -363,14 +363,14 @@ QFont makeQFont(FontInfo const & f)
 
        LYXERR(Debug::FONT, "XFLD: " << font.rawName());
 
-       font.setPointSizeF(f.realSize() * lyxrc.zoom / 100.0);
+       font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0);
 
        LYXERR(Debug::FONT, "The font has size: " << font.pointSizeF());
 
        return font;
 }
 
-} // anon namespace
+} // namespace
 
 
 GuiFontInfo::GuiFontInfo(FontInfo const & f)