The core is now clean enough that we don't need the NoGuiFontLoader/Metrics anymore...

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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index dbfef239924d47ad02415cada414987f28d15d2b..705b9acec70637c38ead3a4fc019e3f5074535fc 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -20,8 +20,6 @@
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
-#include "frontends/NoGuiFontLoader.h"
-#include "frontends/NoGuiFontMetrics.h"
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 
@@ -681,11 +679,6 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
 
 frontend::FontLoader & theFontLoader()
 {
-       static frontend::NoGuiFontLoader no_gui_font_loader;
-
-       if (!use_gui)
-               return no_gui_font_loader;
-
        BOOST_ASSERT(frontend::guiApp);
        return frontend::guiApp->fontLoader();
 }
@@ -699,11 +692,6 @@ frontend::FontMetrics const & theFontMetrics(Font const & f)
 
 frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
 {
-       static frontend::NoGuiFontMetrics no_gui_font_metrics;
-
-       if (!use_gui)
-               return no_gui_font_metrics;
-
        BOOST_ASSERT(frontend::guiApp);
        return frontend::guiApp->fontLoader().metrics(f);
 }