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 6071f51b6d13f4429e87642853a7a3c6c0141c81..b3fa460fece1e0f518b8c8548d69fe0909fff456 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -25,24 +25,14 @@
 #include "lyx_forms.h"
 #include "combox.h"
 
-using frnt::BarPair;
-using frnt::ColorPair;
-using frnt::FamilyPair;
-using frnt::getBarData;
-using frnt::getColorData;
-using frnt::getFamilyData;
-using frnt::getLanguageData;
-using frnt::getSeriesData;
-using frnt::getShapeData;
-using frnt::getSizeData;
-using frnt::LanguagePair;
-using frnt::SeriesPair;
-using frnt::ShapePair;
-using frnt::SizePair;
-
-using lyx::support::getStringFromVector;
-
 using std::vector;
+using std::string;
+
+namespace lyx {
+
+using support::getStringFromVector;
+
+namespace frontend {
 
 
 typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
@@ -182,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);
@@ -195,3 +185,6 @@ ButtonPolicy::SMInput FormCharacter::input(FL_OBJECT *, long)
 
        return activate;
 }
+
+} // namespace frontend
+} // namespace lyx