X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlabel.C;h=3d995c3ea0085da9053c82672d54dbf8df5de48e;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=9d1264dbe0b955da8f64f76fad7a334c9805317a;hpb=3e1919e067d499ae472af9ecf6f352f193ca3f3d;p=lyx.git

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 9d1264dbe0..3d995c3ea0 100644
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -22,13 +22,14 @@
 #include "pariterator.h"
 #include "sgml.h"
 
-#include "frontends/LyXView.h"
-
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/std_ostream.h"
 
-using lyx::support::escape;
+
+namespace lyx {
+
+using support::escape;
 
 using std::string;
 using std::ostream;
@@ -46,15 +47,15 @@ std::auto_ptr<InsetBase> InsetLabel::doClone() const
 }
 
 
-void InsetLabel::getLabelList(Buffer const &, std::vector<string> & list) const
+void InsetLabel::getLabelList(Buffer const &, std::vector<docstring> & list) const
 {
-	list.push_back(getContents());
+	list.push_back(getParam("name"));
 }
 
 
-string const InsetLabel::getScreenLabel(Buffer const &) const
+docstring const InsetLabel::getScreenLabel(Buffer const &) const
 {
-	return getContents();
+	return getParam("name");
 }
 
 
@@ -63,15 +64,16 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 	switch (cmd.action) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetCommandParams p;
-		InsetCommandMailer::string2params("label", cmd.argument, p);
+		InsetCommandParams p("label");
+		// FIXME UNICODE
+		InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
 		if (p.getCmdName().empty()) {
 			cur.noUpdate();
 			break;
 		}
-		if (p.getContents() != params().getContents())
-			cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
-						       p.getContents());
+		if (p["name"] != params()["name"])
+			cur.bv().buffer()->changeRefsIfUnique(params()["name"],
+					p["name"], InsetBase::REF_CODE);
 		setParams(p);
 		break;
 	}
@@ -83,7 +85,7 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-int InsetLabel::latex(Buffer const &, ostream & os,
+int InsetLabel::latex(Buffer const &, odocstream & os,
 		      OutputParams const &) const
 {
 	os << escape(getCommand());
@@ -91,25 +93,22 @@ int InsetLabel::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetLabel::plaintext(Buffer const &, ostream & os,
+int InsetLabel::plaintext(Buffer const &, odocstream & os,
 		      OutputParams const &) const
 {
-	os << '<' << getContents()  << '>';
+	os << '<' << getParam("name") << '>';
 	return 0;
 }
 
 
-int InsetLabel::linuxdoc(Buffer const & buf, ostream & os,
-			 OutputParams const & runparams) const
+int InsetLabel::docbook(Buffer const & buf, odocstream & os,
+			OutputParams const & runparams) const
 {
-	os << "<label id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" >";
+	os << "<!-- anchor id=\""
+           << sgml::cleanID(buf, runparams, getParam("name"))
+           << "\" -->";
 	return 0;
 }
 
 
-int InsetLabel::docbook(Buffer const & buf, ostream & os,
-			OutputParams const & runparams) const
-{
-	os << "<!-- anchor id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" -->";
-	return 0;
-}
+} // namespace lyx