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 cd62f7982ca1916135ebda58b6976da970031462..aad1b540532d01442abf2b5cf776d2d6662183f0 100644 (file)
--- a/src/frontends/Application.cpp
+++ b/src/frontends/Application.cpp
@@ -20,12 +20,12 @@
 #include "frontends/LyXView.h"
 #include "frontends/WorkArea.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "lyx_main.h"  // for lyx::use_gui
-#include "lyxfont.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
+#include "LyX.h"  // for lyx::use_gui
+#include "Font.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
 
 #include "support/lstrings.h"
 #include "support/os.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;