X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.h;h=7dcf3d91b59b46993d919035e480b6d6d1e1ced5;hb=ce7c45bb437c44dae15f96148cb9b793ab0b895c;hp=491e036cd8b3313737885d991535f3f9fda2114b;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 491e036cd8..7dcf3d91b5 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,9 +15,12 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "LString.h"
 #include "lyxlength.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);
+LyXLength::UNIT unitFromString(std::string const & data);
+
+
 
+} // namespace lyx
 
 #endif // LENGTH_COMMON_H