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

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index b32271c20d..7dcf3d91b5 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -16,7 +16,10 @@
 #define LENGTH_COMMON_H
 
 #include "lyxlength.h"
-#include "support/std_string.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