X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.h;h=4d4acc9bb3f14b25aed5d33523afb59fc85c2459;hb=cf96711fc904358f8043b455e3d49719ad70b974;hp=765816ca3e80d4af1c56d60722e304ea664f7e09;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 765816ca3e..4d4acc9bb3 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,8 +15,11 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "support/std_string.h"
-#include "lyxlength.h"
+#include "Length.h"
+
+
+namespace lyx {
+
 
 /// the number of units possible
 extern int const num_units;
@@ -26,12 +29,14 @@ extern int const num_units;
  *
  * FIXME: I am not sure if "mu" should be possible to select (Lgb)
  */
-extern char const * unit_name[];
-extern char const * unit_name_gui[];
-extern char const * unit_name_ltx[];
+extern char const * const unit_name[];
+extern char const * const unit_name_gui[];
 
 /// return the unit given a string representation such as "cm"
-LyXLength::UNIT unitFromString(string const & data);
+Length::UNIT unitFromString(std::string const & data);
+
+
 
+} // namespace lyx
 
 #endif // LENGTH_COMMON_H