* support/qstring_helpers.h: erase ucs4_to_qstring() method.

[lyx.git] / src / lyxlength.h

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 69d73a4c14fe4cbd7b74791ce0873bb837f78386..1fc9e6f79cfa594d2a9fa6a2f07b043528399a94 100644 (file)
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -15,15 +15,14 @@
 #ifndef LYX_LENGTH_H
 #define LYX_LENGTH_H
 
-#include <string>
+#include "support/docstring.h"
+
+
+namespace lyx {
 
 // Solaris/x86 version 9 and earlier define these
-#ifdef PC
-#  undef PC
-#endif
-#ifdef SP
-#  undef SP
-#endif
+#undef PC
+#undef SP
 
 
 /**
@@ -82,6 +81,8 @@ public:
        bool empty() const;
        /// return string representation
        std::string const asString() const;
+       /// return string representation
+       docstring const asDocstring() const;
        /// return string representation for LaTeX
        std::string const asLatexString() const;
        /// return the on-screen size of this length
@@ -116,4 +117,7 @@ bool isValidLength(std::string const & data, LyXLength * result = 0);
 /// return the LyX name of the given unit number
 char const * stringFromUnit(int unit);
 
+
+} // namespace lyx
+
 #endif // LYXLENGTH_H