fix merge build src/frontends/qt4/QDocument.cpp

[lyx.git] / src / frontends / Application.cpp

diff --git a/src/frontends/Application.cpp b/src/frontends/Application.cpp
index 6126e20c5b56de5d46751719ffa3a0cc2cb76c99..aad1b540532d01442abf2b5cf776d2d6662183f0 100644 (file)
--- a/src/frontends/Application.cpp
+++ b/src/frontends/Application.cpp
@@ -23,7 +23,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LyX.h"  // for lyx::use_gui
-#include "LyXFont.h"
+#include "Font.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 
@@ -101,7 +101,7 @@ frontend::FontLoader & theFontLoader()
 }
 
 
-frontend::FontMetrics const & theFontMetrics(LyXFont const & f)
+frontend::FontMetrics const & theFontMetrics(Font const & f)
 {
        static frontend::NoGuiFontMetrics no_gui_font_metrics;