X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetmarginal.C;h=c8f418bcb062c813609ddd6fbb050268e5090c1e;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=71db5f314ac6bb636200c71b4d1baa316dc78917;hpb=edd81011cecb115b1dc05cc68bf5206fa0e853dd;p=lyx.git

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 71db5f314a..c8f418bcb0 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -18,7 +18,8 @@
 
 #include "support/std_ostream.h"
 
-using lyx::docstring;
+
+namespace lyx {
 
 using std::string;
 using std::auto_ptr;
@@ -28,18 +29,16 @@ using std::ostream;
 InsetMarginal::InsetMarginal(BufferParams const & bp)
 	: InsetFootlike(bp)
 {
-	// FIXME UNICODE
-	setLabel(lyx::to_utf8(_("margin")));
-	setInsetName("Marginal");
+	setLabel(_("margin"));
+	setInsetName(from_ascii("Marginal"));
 }
 
 
 InsetMarginal::InsetMarginal(InsetMarginal const & in)
 	: InsetFootlike(in)
 {
-	// FIXME UNICODE
-	setLabel(lyx::to_utf8(_("margin")));
-	setInsetName("Marginal");
+	setLabel(_("margin"));
+	setInsetName(from_ascii("Marginal"));
 }
 
 
@@ -55,7 +54,7 @@ docstring const InsetMarginal::editMessage() const
 }
 
 
-int InsetMarginal::latex(Buffer const & buf, ostream & os,
+int InsetMarginal::latex(Buffer const & buf, odocstream & os,
 			 OutputParams const & runparams) const
 {
 	os << "%\n\\marginpar{";
@@ -64,7 +63,7 @@ int InsetMarginal::latex(Buffer const & buf, ostream & os,
 	return i + 2;
 }
 
-int InsetMarginal::docbook(Buffer const & buf, ostream & os,
+int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
 		       OutputParams const & runparams) const
 {
 	os << "<note role=\"margin\">";
@@ -73,3 +72,6 @@ int InsetMarginal::docbook(Buffer const & buf, ostream & os,
 
 	return i;
 }
+
+
+} // namespace lyx