Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index 33191778c207ad6708c2e35319f13971a63c167d..b3fa460fece1e0f518b8c8548d69fe0909fff456 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -11,29 +11,29 @@
 
 #include <config.h>
 
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "ControlCharacter.h"
 #include "FormCharacter.h"
 #include "forms/form_character.h"
-#include "gettext.h"
-#include "helper_funcs.h"
+
 #include "xforms_helpers.h"
-#include "lyx_forms.h"
-#include "combox.h"
+#include "xformsBC.h"
 
-#include "frnt_lang.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
 
 #include "support/lstrings.h"
 
-#include <vector>
-
-using namespace lyx::support;
+#include "lyx_forms.h"
+#include "combox.h"
 
 using std::vector;
-using std::find;
+using std::string;
+
+namespace lyx {
+
+using support::getStringFromVector;
+
+namespace frontend {
 
-using namespace frnt;
 
 typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
 
@@ -172,7 +172,7 @@ ButtonPolicy::SMInput FormCharacter::input(FL_OBJECT *, long)
                activate = ButtonPolicy::SMI_VALID;
 
        pos = fl_get_choice(dialog_->choice_bar);
-       if (bar_[pos - 1] != frnt::IGNORE)
+       if (bar_[pos - 1] != IGNORE)
                activate = ButtonPolicy::SMI_VALID;
 
        pos = fl_get_choice(dialog_->choice_color);
@@ -185,3 +185,6 @@ ButtonPolicy::SMInput FormCharacter::input(FL_OBJECT *, long)
 
        return activate;
 }
+
+} // namespace frontend
+} // namespace lyx