cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lengthcommon.h

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 491e036cd8b3313737885d991535f3f9fda2114b..ff5d6f507927764ed8fc886d2aad151f6b79883e 100644 (file)
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,9 +15,9 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "LString.h"
 #include "lyxlength.h"
 
+
 /// the number of units possible
 extern int const num_units;
 
@@ -26,12 +26,11 @@ 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);
 
 
 #endif // LENGTH_COMMON_H