From edd81011cecb115b1dc05cc68bf5206fa0e853dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Sat, 9 Sep 2006 18:52:00 +0000
Subject: [PATCH] Change editMessage to return a docstring, change functions to
 not use to_utf8.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14953 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/insetbase.C      | 5 ++---
 src/insets/insetbase.h      | 4 +++-
 src/insets/insetbox.C       | 6 ++++--
 src/insets/insetbox.h       | 2 +-
 src/insets/insetbranch.C    | 7 ++++---
 src/insets/insetbranch.h    | 2 +-
 src/insets/insetcaption.C   | 5 ++---
 src/insets/insetcaption.h   | 2 +-
 src/insets/insetcharstyle.C | 5 ++---
 src/insets/insetcharstyle.h | 2 +-
 src/insets/insetenv.C       | 6 ++++--
 src/insets/insetenv.h       | 2 +-
 src/insets/insetert.C       | 6 +++---
 src/insets/insetert.h       | 2 +-
 src/insets/insetfloat.C     | 6 +++---
 src/insets/insetfloat.h     | 2 +-
 src/insets/insetfoot.C      | 6 +++---
 src/insets/insetfoot.h      | 2 +-
 src/insets/insetmarginal.C  | 6 +++---
 src/insets/insetmarginal.h  | 2 +-
 src/insets/insetnote.C      | 7 ++++---
 src/insets/insetnote.h      | 2 +-
 src/insets/insetoptarg.C    | 7 ++++---
 src/insets/insetoptarg.h    | 2 +-
 src/insets/insettabular.C   | 5 ++---
 src/insets/insettabular.h   | 2 +-
 src/insets/insettext.C      | 5 ++---
 src/insets/insettext.h      | 2 +-
 src/insets/insettheorem.h   | 2 +-
 src/insets/insetwrap.C      | 7 ++++---
 src/insets/insetwrap.h      | 2 +-
 src/mathed/math_hullinset.C | 5 ++---
 src/mathed/math_hullinset.h | 2 +-
 33 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 1212ea8c00..9551300a6f 100644
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -252,10 +252,9 @@ bool InsetBase::autoDelete() const
 }
 
 
-std::string const InsetBase::editMessage() const
+lyx::docstring const InsetBase::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened inset"));
+	return _("Opened inset");
 }
 
 
diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index 8bd5ec5304..23c9010741 100644
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -12,6 +12,8 @@
 #ifndef INSETBASE_H
 #define INSETBASE_H
 
+#include "support/docstring.h"
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -210,7 +212,7 @@ public:
 		HIGHLY_EDITABLE
 	};
 	/// what appears in the minibuffer when opening
-	virtual std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	virtual EDITABLE editable() const;
 	/// can we go further down on mouse click?
diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 9906caa8af..9401ff3f4f 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -30,6 +30,8 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::auto_ptr;
 using std::string;
 using std::istringstream;
@@ -116,9 +118,9 @@ auto_ptr<InsetBase> InsetBox::doClone() const
 }
 
 
-string const InsetBox::editMessage() const
+docstring const InsetBox::editMessage() const
 {
-	return lyx::to_utf8(_("Opened Box Inset"));
+	return _("Opened Box Inset");
 }
 
 
diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index f61d240548..577878c752 100644
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -60,7 +60,7 @@ public:
 	///
 	~InsetBox();
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::BOX_CODE; }
 	///
diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index 5c3b6a303c..9b08b7c7d1 100644
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -26,6 +26,8 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::string;
 using std::auto_ptr;
 using std::istringstream;
@@ -67,10 +69,9 @@ auto_ptr<InsetBase> InsetBranch::doClone() const
 }
 
 
-string const InsetBranch::editMessage() const
+docstring const InsetBranch::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Branch Inset"));
+	return _("Opened Branch Inset");
 }
 
 
diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index c70d2f2bf2..490e02b73a 100644
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -41,7 +41,7 @@ public:
 	///
 	~InsetBranch();
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::BRANCH_CODE; }
 	///
diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 004e6d9d14..cd247819dd 100644
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -75,10 +75,9 @@ void InsetCaption::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-string const InsetCaption::editMessage() const
+docstring const InsetCaption::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Caption Inset"));
+	return _("Opened Caption Inset");
 }
 
 
diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h
index 29383105f6..19e564be2c 100644
--- a/src/insets/insetcaption.h
+++ b/src/insets/insetcaption.h
@@ -33,7 +33,7 @@ public:
 	///
 	virtual InsetBase::Code lyxCode() const;
 	///
-	virtual std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	virtual void cursorPos
 		(CursorSlice const & sl, bool boundary, int & x, int & y) const;
diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index e6a6de1e83..e5543adc4f 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -114,10 +114,9 @@ void InsetCharStyle::setDefined(CharStyles::iterator cs)
 }
 
 
-string const InsetCharStyle::editMessage() const
+docstring const InsetCharStyle::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened CharStyle Inset"));
+	return _("Opened CharStyle Inset");
 }
 
 
diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index de785ed71c..23b27a3e3c 100644
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -55,7 +55,7 @@ public:
 	/// (Re-)set the character style parameters from \p cs
 	void setDefined(CharStyles::iterator cs);
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::CHARSTYLE_CODE; }
 	///
diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index 58fd9b333f..5bfb58db25 100644
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -21,6 +21,8 @@
 #include "support/std_ostream.h"
 
 
+using lyx::docstring;
+
 using std::string;
 using std::auto_ptr;
 using std::ostream;
@@ -60,10 +62,10 @@ void InsetEnvironment::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-string const InsetEnvironment::editMessage() const
+docstring const InsetEnvironment::editMessage() const
 {
 	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Environment Inset: ")) + getInsetName();
+	return _("Opened Environment Inset: ") + lyx::from_utf8(getInsetName());
 }
 
 
diff --git a/src/insets/insetenv.h b/src/insets/insetenv.h
index 7de2ba7c46..51592f29c2 100644
--- a/src/insets/insetenv.h
+++ b/src/insets/insetenv.h
@@ -30,7 +30,7 @@ public:
 	int latex(Buffer const &, std::ostream &,
 		  OutputParams const &) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	InsetBase::EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 74ab9af3e8..4b3a6f8f58 100644
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -36,6 +36,7 @@
 
 #include <sstream>
 
+using lyx::docstring;
 using lyx::pos_type;
 using lyx::support::token;
 
@@ -137,10 +138,9 @@ void InsetERT::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-string const InsetERT::editMessage() const
+docstring const InsetERT::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened ERT Inset"));
+	return _("Opened ERT Inset");
 }
 
 
diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 0fe7b2d2a1..bcfe861512 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -45,7 +45,7 @@ public:
 	///
 	void read(Buffer const & buf, LyXLex & lex);
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	bool insetAllowed(InsetBase::Code code) const;
 	///
diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index a9c48303c1..491102b91e 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -36,6 +36,7 @@
 
 #include <sstream>
 
+using lyx::docstring;
 using lyx::support::contains;
 
 using std::endl;
@@ -288,10 +289,9 @@ auto_ptr<InsetBase> InsetFloat::doClone() const
 }
 
 
-string const InsetFloat::editMessage() const
+docstring const InsetFloat::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Float Inset"));
+	return _("Opened Float Inset");
 }
 
 
diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 622adbaaef..0303197b57 100644
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -60,7 +60,7 @@ public:
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	bool insetAllowed(InsetBase::Code) const;
 	/** returns true if, when outputing LaTeX, font changes should
diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index cacf06c352..0876d9b8d9 100644
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -23,6 +23,7 @@
 
 #include "support/std_ostream.h"
 
+using lyx::docstring;
 
 using std::string;
 using std::auto_ptr;
@@ -53,10 +54,9 @@ auto_ptr<InsetBase> InsetFoot::doClone() const
 }
 
 
-string const InsetFoot::editMessage() const
+docstring const InsetFoot::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Footnote Inset"));
+	return _("Opened Footnote Inset");
 }
 
 
diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h
index dfcfed3b63..640014c133 100644
--- a/src/insets/insetfoot.h
+++ b/src/insets/insetfoot.h
@@ -31,7 +31,7 @@ public:
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const & runparams) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 protected:
 	InsetFoot(InsetFoot const &);
 private:
diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index f6e69e6a33..71db5f314a 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -18,6 +18,7 @@
 
 #include "support/std_ostream.h"
 
+using lyx::docstring;
 
 using std::string;
 using std::auto_ptr;
@@ -48,10 +49,9 @@ auto_ptr<InsetBase> InsetMarginal::doClone() const
 }
 
 
-string const InsetMarginal::editMessage() const
+docstring const InsetMarginal::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Marginal Note Inset"));
+	return _("Opened Marginal Note Inset");
 }
 
 
diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h
index e7c34f2907..3552a49bae 100644
--- a/src/insets/insetmarginal.h
+++ b/src/insets/insetmarginal.h
@@ -32,7 +32,7 @@ public:
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const & runparams) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 protected:
 	InsetMarginal(InsetMarginal const &);
 private:
diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 4f9dd7114f..82ed210bab 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -34,6 +34,8 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::string;
 using std::auto_ptr;
 using std::istringstream;
@@ -141,10 +143,9 @@ auto_ptr<InsetBase> InsetNote::doClone() const
 }
 
 
-string const InsetNote::editMessage() const
+docstring const InsetNote::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Note Inset"));
+	return _("Opened Note Inset");
 }
 
 
diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 555c41f991..02e7ba0afb 100644
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -45,7 +45,7 @@ public:
 	///
 	~InsetNote();
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
 	///
diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 9c5db9df4c..2fc0010763 100644
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -19,6 +19,8 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::string;
 using std::auto_ptr;
 using std::ostream;
@@ -53,10 +55,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");
 }
 
 
diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index c49d78fc48..9676c335f0 100644
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -27,7 +27,7 @@ public:
 	/// code of the inset
 	InsetBase::Code lyxCode() const { return InsetBase::OPTARG_CODE; }
 	/// return an message upon editing
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 
 	/// Standard LaTeX output -- short-circuited
 	int latex(Buffer const &, std::ostream &,
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 0460ae1124..faebec58b3 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -449,10 +449,9 @@ void InsetTabular::drawCellLines(Painter & pain, int x, int y,
 }
 
 
-string const InsetTabular::editMessage() const
+docstring const InsetTabular::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened table"));
+	return _("Opened table");
 }
 
 
diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index ba7fa10013..0532d31ad3 100644
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -68,7 +68,7 @@ public:
 	///
 	void drawSelection(PainterInfo & pi, int x, int y) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 0acd4dd3dc..a4b4080516 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -225,10 +225,9 @@ void InsetText::drawSelection(PainterInfo & pi, int x, int y) const
 }
 
 
-string const InsetText::editMessage() const
+docstring const InsetText::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Text Inset"));
+	return _("Opened Text Inset");
 }
 
 
diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 147c76cca6..202dd7df1a 100644
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -53,7 +53,7 @@ public:
 	/// draw inset selection
 	void drawSelection(PainterInfo & pi, int x, int y) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
diff --git a/src/insets/insettheorem.h b/src/insets/insettheorem.h
index b4e00a9d73..ed9b88f81c 100644
--- a/src/insets/insettheorem.h
+++ b/src/insets/insettheorem.h
@@ -34,7 +34,7 @@ public:
 	int latex(Buffer const &, std::ostream &,
 		  OutputParams const &) const;
 	///
-	string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 private:
 	virtual std::auto_ptr<InsetBase> doClone() const;
 
diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 0a84d31d1a..645ec11f49 100644
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -34,6 +34,8 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::string;
 using std::endl;
 using std::auto_ptr;
@@ -186,10 +188,9 @@ auto_ptr<InsetBase> InsetWrap::doClone() const
 }
 
 
-string const InsetWrap::editMessage() const
+docstring const InsetWrap::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Opened Wrap Inset"));
+	return _("Opened Wrap Inset");
 }
 
 
diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index 722acce017..0754176465 100644
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -56,7 +56,7 @@ public:
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
 	///
-	std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	bool insetAllowed(InsetBase::Code) const;
 	///
diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 360209b35b..111026f693 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1310,10 +1310,9 @@ void MathHullInset::edit(LCursor & cur, bool left)
 }
 
 
-string const MathHullInset::editMessage() const
+docstring const MathHullInset::editMessage() const
 {
-	// FIXME UNICODE
-	return lyx::to_utf8(_("Math editor mode"));
+	return _("Math editor mode");
 }
 
 
diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index a7a220252f..5f0edb5c61 100644
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -186,7 +186,7 @@ private:
 //
 public:
 	/// what appears in the minibuffer when opening
-	virtual std::string const editMessage() const;
+	virtual lyx::docstring const editMessage() const;
 	///
 	virtual void mutateToText();
 	///
-- 
2.39.5