Move Color::color enum to ColorCode.h

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

diff --git a/src/frontends/Application.cpp b/src/frontends/Application.cpp
index cd62f7982ca1916135ebda58b6976da970031462..83076e7abf107b936e41ea6c99e10336cf23a7ae 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"
@@ -52,14 +52,11 @@ LyXView & Application::createView(unsigned int width,
                                  const std::string & geometryArg)
 {
        LyXView & view = gui().createRegisteredView();
-       int view_id = view.id();
-       
        theLyXFunc().setLyXView(&view);
 
-       /*int workArea_id_ =*/ gui().newWorkArea(width, height, view_id);
-
        view.init();
        view.setGeometry(width, height, posx, posy, maximized, iconSizeXY, geometryArg);
+
        view.setFocus();
 
        setCurrentView(view);
@@ -101,7 +98,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;