Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / xftFontLoader.h

diff --git a/src/frontends/gtk/xftFontLoader.h b/src/frontends/gtk/xftFontLoader.h
index 9194ae605a904188c78c206044cb5a76a2262a8f..a04f11f5dfaa57f5e5f43c135acd0efbe01522f6 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.h
+++ b/src/frontends/gtk/xftFontLoader.h
@@ -6,14 +6,15 @@
  *
  * \author Huang Ying
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef XFT_FONT_LOADER_H
 #define XFT_FONT_LOADER_H
 
 #include "lyxfont.h"
-#include "LString.h"
+
+#include <gtkmm.h>
 #include <X11/Xft/Xft.h>
 
 class GWorkArea;
@@ -38,11 +39,12 @@ public:
                      LyXFont::FONT_SHAPE shape,
                      LyXFont::FONT_SIZE size)
        {
-                if (fonts_[family][series][shape][size])
-                        return fonts_[family][series][shape][size];
-                else
+               if (fonts_[family][series][shape][size])
+                       return fonts_[family][series][shape][size];
+               else
                        return doLoad(family, series, shape, size);
-        }
+       }
+
        bool isSpecial(LyXFont const & f)
        {
                switch (f.family()) {
@@ -61,7 +63,7 @@ private:
                                    LyXFont::FONT_SERIES series,
                                    LyXFont::FONT_SHAPE shape,
                                    LyXFont::FONT_SIZE size);
-       string familyString(LyXFont::FONT_FAMILY family);
+       std::string familyString(LyXFont::FONT_FAMILY family);
        /// Reset font handler
        void reset();
 
@@ -70,9 +72,9 @@ private:
 
        /** Does the actual loading of a font. Updates fontstruct. */
        XftFont * doLoad(LyXFont::FONT_FAMILY family,
-                         LyXFont::FONT_SERIES series,
-                         LyXFont::FONT_SHAPE shape,
-                         LyXFont::FONT_SIZE size);
+                        LyXFont::FONT_SERIES series,
+                        LyXFont::FONT_SHAPE shape,
+                        LyXFont::FONT_SIZE size);
 };
 
 ///