update Basque and Romanian l10n

[lyx.git] / src / lyxgluelength.h

diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index ea7bfb62a778fc0a64efdf2a57907aa74ae4f074..667efa826e8390d16ba491aa3118b04f59d5fa72 100644 (file)
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -16,7 +16,8 @@
 
 #include "lyxlength.h"
 
-#include "LString.h"
+
+namespace lyx {
 
 
 class LyXGlueLength {
@@ -36,7 +37,7 @@ public:
          1.2 cm  //  4mm +2pt  //  2cm -4mm +2mm  //  4+0.1-0.2cm
          The traditional Latex format is also accepted, like
          4cm plus 10pt minus 10pt */
-       explicit LyXGlueLength(string const & data);
+       explicit LyXGlueLength(std::string const & data);
 
        ///
        LyXLength const & len() const;
@@ -47,11 +48,11 @@ public:
 
 
        /// conversion
-       string const asString() const;
+       std::string const asString() const;
        ///
-       string const asLatexString() const;
+       std::string const asLatexString() const;
 
-       friend bool isValidGlueLength(string const & data,
+       friend bool isValidGlueLength(std::string const & data,
                                      LyXGlueLength* result);
 
 private:
@@ -69,6 +70,9 @@ bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2);
 bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2);
 /** If "data" is valid, the length represented by it is
     stored into "result", if that is not 0. */
-bool isValidGlueLength(string const & data, LyXGlueLength * result = 0);
+bool isValidGlueLength(std::string const & data, LyXGlueLength * result = 0);
+
+
+} // namespace lyx
 
 #endif // LYXGLUELENGTH_H