Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormText.C b/src/frontends/xforms/FormText.C
index 7b5f73671d497c8fbab8160b3ebe4477c5b3a3de..95af628a270c620982cf962827e431398c67954b 100644 (file)
--- a/src/frontends/xforms/FormText.C
+++ b/src/frontends/xforms/FormText.C
@@ -5,21 +5,31 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "ControlCommand.h"
 #include "FormText.h"
+#include "ControlCommand.h"
 #include "forms/form_text.h"
+
+#include "xformsBC.h"
 #include "forms_gettext.h"
 
+#include "controllers/ButtonController.h"
+
 #include "support/lstrings.h"
 
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
+
+using std::string;
+
+namespace lyx {
+
+using support::trim;
+
+namespace frontend {
 
 typedef FormController<ControlCommand, FormView<FD_text> > base_class;
 
@@ -61,3 +71,6 @@ void FormText::apply()
 {
        controller().params().setContents(fl_get_input(dialog_->input_text));
 }
+
+} // namespace frontend
+} // namespace lyx