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

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 765816ca3e..ef74e411b7 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,9 +15,9 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "support/std_string.h"
 #include "lyxlength.h"
 
+
 /// the number of units possible
 extern int const num_units;
 
@@ -26,12 +26,12 @@ 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[];
+extern char const * const unit_name_ltx[];
 
 /// return the unit given a string representation such as "cm"
-LyXLength::UNIT unitFromString(string const & data);
+LyXLength::UNIT unitFromString(std::string const & data);
 
 
 #endif // LENGTH_COMMON_H