Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FormCharacter.h

diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index 4160cd1980581a82a108f448dbdcad607b11d75f..d07255d83f5223d04db4b418d7b3e4a0a32195d6 100644 (file)
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -13,12 +13,13 @@
 #ifndef FORM_CHARACTER_H
 #define FORM_CHARACTER_H
 
-
 #include "FormDialogView.h"
-#include "lyxfont.h"          // for LyXFont enums
 #include "ControlCharacter.h" // for ControlCharacter enum
-#include "LColor.h"           // for LColor enum
-#include "character.h"        // for FONT_STATE enum
+
+#include "LColor.h"
+
+namespace lyx {
+namespace frontend {
 
 struct FD_character;
 
@@ -47,19 +48,22 @@ private:
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        ///
-       std::vector<LyXFont::FONT_FAMILY>  family_;
+       std::vector<LyXFont::FONT_FAMILY> family_;
        ///
-       std::vector<LyXFont::FONT_SERIES>  series_;
+       std::vector<LyXFont::FONT_SERIES> series_;
        ///
-       std::vector<LyXFont::FONT_SHAPE>   shape_;
+       std::vector<LyXFont::FONT_SHAPE> shape_;
        ///
-       std::vector<LyXFont::FONT_SIZE>    size_;
+       std::vector<LyXFont::FONT_SIZE> size_;
        ///
-       std::vector<frnt::FONT_STATE>      bar_;
+       std::vector<FONT_STATE> bar_;
        ///
-       std::vector<LColor::color>         color_;
+       std::vector<LColor_color> color_;
        ///
-       std::vector<string>                lang_;
+       std::vector<std::string> lang_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif