unicode: ditch another utf8 roundtrip

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15865 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index c03dd4d67141854d641738ba3bec93318ef58130..64b9441d32d409201898ba4eb753ba3d6aacaada 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -107,8 +107,7 @@ void InsetVSpace::write(Buffer const &, ostream & os) const
 docstring const InsetVSpace::label() const
 {
        static docstring const label = _("Vertical Space");
-       // FIXME UNICODE
-       return label + " (" + from_utf8(space_.asGUIName()) + ')';
+       return label + " (" + space_.asGUIName() + ')';
 }
 
 

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 453cca12490146922c2144f54eb6496454c63c61..1fc9e6f79cfa594d2a9fa6a2f07b043528399a94 100644 (file)
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -16,7 +16,6 @@
 #define LYX_LENGTH_H
 
 #include "support/docstring.h"
-#include <string>
 
 
 namespace lyx {

diff --git a/src/vspace.C b/src/vspace.C
index 341229483c094c05b905ad62e79a7b6cc178c4f9..c1fdbf71ad93d5747f5dc0a219b58b96658fdd18 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -482,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 = to_utf8(_("Default skip"));
+               result = _("Default skip");
                break;
        case SMALLSKIP:
-               result = to_utf8(_("Small skip"));
+               result = _("Small skip");
                break;
        case MEDSKIP:
-               result = to_utf8(_("Medium skip"));
+               result = _("Medium skip");
                break;
        case BIGSKIP:
-               result = to_utf8(_("Big skip"));
+               result = _("Big skip");
                break;
        case VFILL:
-               result = to_utf8(_("Vertical fill"));
+               result = _("Vertical fill");
                break;
        case LENGTH:
-               result = len_.asString();
+               result = from_ascii(len_.asString());
                break;
        }
        if (keep_)
-               result += ", " + to_utf8(_("protected"));
+               result += ", " + _("protected");
        return result;
 }
 

diff --git a/src/vspace.h b/src/vspace.h
index fdbc7760f0847e0ad21f9a048b1e2cd7701e1132..b358b40621b486b7e94ca6077c973dd59de7a072 100644 (file)
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -65,7 +65,7 @@ public:
        /// the latex representation
        std::string const asLatexCommand(BufferParams const & params) const;
        /// how it is seen in the LyX window
-       std::string const asGUIName() const;
+       docstring const asGUIName() const;
        /// the size of the space on-screen
        int inPixels(BufferView const & bv) const;