hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetcharstyle.C

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index c308ada16f2b8c2acab367811cf914dedfb13dcf..6d953726c8ed08ec2d0e3413b32808c11071b9aa 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -38,8 +38,8 @@
 
 #include <sstream>
 
-using lyx::docstring;
-using lyx::odocstream;
+
+namespace lyx {
 
 using std::string;
 using std::auto_ptr;
@@ -51,7 +51,7 @@ using std::ostringstream;
 
 void InsetCharStyle::init()
 {
-       setInsetName("CharStyle");
+       setInsetName(from_utf8("CharStyle"));
        setInlined();
        setDrawFrame(false);
 }
@@ -157,12 +157,11 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
                int w = 0;
                int a = 0;
                int d = 0;
-               string s(params_.type);
+               // FIXME UNICODE
+               docstring s(from_utf8(params_.type));
                if (undefined())
-                       // FIXME UNICODE
-                       s = lyx::to_utf8(_("Undef: ")) + s;
-               docstring ds(s.begin(), s.end());
-               theFontMetrics(font).rectText(ds, w, a, d);
+                       s = _("Undef: ") + s;
+               theFontMetrics(font).rectText(s, w, a, d);
                dim.wid = max(dim.wid, w);
        }
        dim.asc += TEXT_TO_INSET_OFFSET;
@@ -205,14 +204,13 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                int w = 0;
                int a = 0;
                int d = 0;
-               string s(params_.type);
+               // FIXME UNICODE
+               docstring s(from_utf8(params_.type));
                if (undefined())
-                       // FIXME UNICODE
-                       s = lyx::to_utf8(_("Undef: ")) + s;
-               docstring ds(s.begin(), s.end());
-               theFontMetrics(font).rectText(ds, w, a, d);
+                       s = _("Undef: ") + s;
+               theFontMetrics(font).rectText(s, w, a, d);
                pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
-                       ds, font, LColor::none, LColor::none);
+                       s, font, LColor::none, LColor::none);
        }
 
        // a visual clue when the cursor is inside the inset
@@ -288,9 +286,9 @@ int InsetCharStyle::latex(Buffer const & buf, odocstream & os,
 {
        if (!undefined()) {
                // FIXME UNICODE
-               os << '\\' << lyx::from_utf8(params_.latexname);
+               os << '\\' << from_utf8(params_.latexname);
                if (!params_.latexparam.empty())
-                       os << lyx::from_utf8(params_.latexparam);
+                       os << from_utf8(params_.latexparam);
                os << '{';
        }
        int i = InsetText::latex(buf, os, runparams);
@@ -376,3 +374,6 @@ void InsetCharStyleParams::read(LyXLex & lex)
                }
        }
 }
+
+
+} // namespace lyx