fix bug 580: reading of some ill-formed tables

[lyx.git] / src / lengthcommon.h

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 57095514ba55c9b0df78c44e7b763f67885e3dbc..4d4acc9bb3f14b25aed5d33523afb59fc85c2459 100644 (file)
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -1,10 +1,25 @@
 // -*- C++ -*-
+/**
+ * \file lengthcommon.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "LString.h"
-#include "lyxlength.h"
+#include "Length.h"
+
+
+namespace lyx {
+
 
 /// the number of units possible
 extern int const num_units;
@@ -14,9 +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 * 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