Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/xforms_helpers.h b/src/frontends/xforms/xforms_helpers.h
index 119233df6d63b0c5b4bb4f1e1e31ab1b61dadcd2..0d003d1ea7fecc52c85653ec2edea02298321214 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.h
+++ b/src/frontends/xforms/xforms_helpers.h
@@ -12,7 +12,6 @@
 #ifndef XFORMSHELPERS_H
 #define XFORMSHELPERS_H
 
-
 #include "forms_fwd.h"
 
 #include "Color.h"
@@ -22,6 +21,9 @@
 
 class LyXLength;
 
+namespace lyx {
+namespace frontend {
+
 /// parse "&Save" etc. to <"Save", "#S">. Does not handle &&
 std::pair<std::string, std::string> parse_shortcut(std::string const & str);
 
@@ -29,11 +31,10 @@ std::pair<std::string, std::string> parse_shortcut(std::string const & str);
 unsigned long fl_getmcolor(int i, unsigned int * r, unsigned int * g,
                           unsigned int * b);
 
-// what we always need for lengths
-std::string const choice_Length_All =
-    "cm|mm|in|text%%|col%%|page%%|line%%|ex|em|pt|sp|bp|dd|pc|cc|mu";
-std::string const choice_Length_WithUnit =
-    "cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu";     // all with a Unit
+/** Generate a string of available length units with which to
+ *  populate a choice widget.
+ */
+std::string const buildChoiceLengthString();
 
 /// return the (in)active state of the object
 bool isActive(FL_OBJECT * ob);
@@ -117,4 +118,8 @@ private:
        ///
        static std::string error_message;
 };
+
+} // namespace frontend
+} // namespace lyx
+
 #endif // XFORMSHELPERS_H