Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / xfont_metrics.C

diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C
index e6eac434ca5b736d6c76322953696a753f196eab..a150e65df90b065bbbc8116cca3326c8968701d6 100644 (file)
--- a/src/frontends/xforms/xfont_metrics.C
+++ b/src/frontends/xforms/xfont_metrics.C
@@ -6,20 +6,30 @@
  * \author unknown
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "support/lstrings.h"
 #include "xfont_metrics.h"
+#include "font_metrics.h"
 #include "xfont_loader.h"
-#include "lyxrc.h"
+
 #include "encoding.h"
 #include "language.h"
+#include "lyxrc.h"
+
+#include "frontends/lyx_gui.h"
+
+#include "support/lstrings.h"
 
 #include <boost/scoped_array.hpp>
 
+using std::string;
+
+using lyx::support::uppercase;
+using lyx::frontend::fontloader;
+
 namespace {
 
 inline
@@ -108,7 +118,7 @@ int rbearing(char c, LyXFont const & f)
 
 int width(char const * s, size_t n, LyXFont const & f)
 {
-       if (!lyxrc.use_gui)
+       if (!lyx_gui::use_gui)
                return n;
 
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
@@ -193,7 +203,7 @@ namespace xfont_metrics {
 
 int width(XChar2b const * s, int n, LyXFont const & f)
 {
-       if (!lyxrc.use_gui)
+       if (!lyx_gui::use_gui)
                return n;
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {