hopefully fix tex2lyx linking.

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index d97cb8eca35ec7649e517a1476b8a309a4eb5850..c1fdbf71ad93d5747f5dc0a219b58b96658fdd18 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -21,11 +21,14 @@
 #include "support/convert.h"
 #include "support/lstrings.h"
 
-using lyx::support::compare;
-using lyx::support::isStrDbl;
-using lyx::support::ltrim;
-using lyx::support::prefixIs;
-using lyx::support::rtrim;
+
+namespace lyx {
+
+using support::compare;
+using support::isStrDbl;
+using support::ltrim;
+using support::prefixIs;
+using support::rtrim;
 
 using std::string;
 
@@ -479,31 +482,31 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 }
 
 
-string const VSpace::asGUIName() const
+docstring const VSpace::asGUIName() const
 {
-       string result;
+       docstring result;
        switch (kind_) {
        case DEFSKIP:
-               result = lyx::to_utf8(_("Default skip"));
+               result = _("Default skip");
                break;
        case SMALLSKIP:
-               result = lyx::to_utf8(_("Small skip"));
+               result = _("Small skip");
                break;
        case MEDSKIP:
-               result = lyx::to_utf8(_("Medium skip"));
+               result = _("Medium skip");
                break;
        case BIGSKIP:
-               result = lyx::to_utf8(_("Big skip"));
+               result = _("Big skip");
                break;
        case VFILL:
-               result = lyx::to_utf8(_("Vertical fill"));
+               result = _("Vertical fill");
                break;
        case LENGTH:
-               result = len_.asString();
+               result = from_ascii(len_.asString());
                break;
        }
        if (keep_)
-               result += ", " + lyx::to_utf8(_("protected"));
+               result += ", " + _("protected");
        return result;
 }
 
@@ -541,3 +544,6 @@ int VSpace::inPixels(BufferView const & bv) const
                return 0;
        }
 }
+
+
+} // namespace lyx