X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetoptarg.C;h=d5ed89d3c9a3c4e8cbe75258857e58af8fac750a;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=9c5db9df4ce8c016536a3f574f8242e972912a4e;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 9c5db9df4c..d5ed89d3c9 100644
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -19,6 +19,9 @@
 
 #include <sstream>
 
+
+namespace lyx {
+
 using std::string;
 using std::auto_ptr;
 using std::ostream;
@@ -31,8 +34,7 @@ InsetOptArg::InsetOptArg(BufferParams const & ins)
 	LyXFont font(LyXFont::ALL_SANE);
 	font.setColor(LColor::collapsable);
 	setLabelFont(font);
-	// FIXME UNICODE
-	setLabel(lyx::to_utf8(_("opt")));
+	setLabel(_("opt"));
 }
 
 
@@ -42,8 +44,7 @@ InsetOptArg::InsetOptArg(InsetOptArg const & in)
 	LyXFont font(LyXFont::ALL_SANE);
 	font.setColor(LColor::collapsable);
 	setLabelFont(font);
-	// FIXME UNICODE
-	setLabel(lyx::to_utf8(_("opt")));
+	setLabel(_("opt"));
 }
 
 
@@ -53,10 +54,9 @@ auto_ptr<InsetBase> InsetOptArg::doClone() const
 }
 
 
-string const InsetOptArg::editMessage() const
+docstring const InsetOptArg::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Optional Argument Inset"));
+	return _("Opened Optional Argument Inset");
 }
 
 
@@ -67,34 +67,37 @@ void InsetOptArg::write(Buffer const & buf, ostream & os) const
 }
 
 
-int InsetOptArg::latex(Buffer const &, ostream &,
+int InsetOptArg::latex(Buffer const &, odocstream &,
 		       OutputParams const &) const
 {
 	return 0;
 }
 
-int InsetOptArg::docbook(Buffer const &, ostream &,
+int InsetOptArg::docbook(Buffer const &, odocstream &,
 		       OutputParams const &) const
 {
 	return 0;
 }
 
 
-int InsetOptArg::plaintext(Buffer const &, ostream &,
+int InsetOptArg::plaintext(Buffer const &, odocstream &,
 		       OutputParams const &) const
 {
 	return 0;
 }
 
 
-int InsetOptArg::latexOptional(Buffer const & buf, ostream & os,
+int InsetOptArg::latexOptional(Buffer const & buf, odocstream & os,
 			       OutputParams const & runparams) const
 {
-	ostringstream ss;
+	odocstringstream ss;
 	int ret = InsetText::latex(buf, ss, runparams);
-	string str = ss.str();
-	if (str.find(']') != string::npos)
+	docstring str = ss.str();
+	if (str.find(']') != docstring::npos)
 		str = '{' + str + '}';
 	os << '[' << str << ']';
 	return ret;
 }
+
+
+} // namespace lyx