From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Thu, 21 Dec 2006 20:52:59 +0000 (+0000)
Subject: get rid of more utf8 conversions
X-Git-Tag: 1.6.10~11467
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1e9f9be48394da312b685cc4d88cbf9aa2dc01a8;p=features.git

get rid of more utf8 conversions


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16372 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/controllers/ControlBox.C b/src/frontends/controllers/ControlBox.C
index 615bbf2b7b..1bbf1a998f 100644
--- a/src/frontends/controllers/ControlBox.C
+++ b/src/frontends/controllers/ControlBox.C
@@ -51,7 +51,7 @@ void ControlBox::dispatchParams()
 }
 
 
-void box_gui_tokens(vector<string> & ids, vector<string> & gui_names)
+void box_gui_tokens(vector<string> & ids, vector<docstring> & gui_names)
 {
 	char const * const ids_[] = {
 		"Frameless", "Boxed", "ovalbox",
@@ -59,17 +59,16 @@ void box_gui_tokens(vector<string> & ids, vector<string> & gui_names)
 	size_t const ids_size = sizeof(ids_) / sizeof(char *);
 	ids = vector<string>(ids_, ids_ + ids_size);
 	gui_names.clear();
-	// FIXME UNICODE
-	gui_names.push_back(lyx::to_utf8(_("No frame drawn")));
-	gui_names.push_back(lyx::to_utf8(_("Rectangular box")));
-	gui_names.push_back(lyx::to_utf8(_("Oval box, thin")));
-	gui_names.push_back(lyx::to_utf8(_("Oval box, thick")));
-	gui_names.push_back(lyx::to_utf8(_("Shadow box")));
-	gui_names.push_back(lyx::to_utf8(_("Double box")));
+	gui_names.push_back(_("No frame drawn"));
+	gui_names.push_back(_("Rectangular box"));
+	gui_names.push_back(_("Oval box, thin"));
+	gui_names.push_back(_("Oval box, thick"));
+	gui_names.push_back(_("Shadow box"));
+	gui_names.push_back(_("Double box"));
 }
 
 void box_gui_tokens_special_length(vector<string> & ids,
-	vector<string> & gui_names)
+	vector<docstring> & gui_names)
 {
 	char const * const ids_[] = {
 		"none", "height", "depth",
@@ -77,12 +76,11 @@ void box_gui_tokens_special_length(vector<string> & ids,
 	size_t const ids_size = sizeof(ids_) / sizeof(char *);
 	ids = vector<string>(ids_, ids_ + ids_size);
 	gui_names.clear();
-	// FIXME UNICODE
-	gui_names.push_back(lyx::to_utf8(_("None")));
-	gui_names.push_back(lyx::to_utf8(_("Height")));
-	gui_names.push_back(lyx::to_utf8(_("Depth")));
-	gui_names.push_back(lyx::to_utf8(_("Total Height")));
-	gui_names.push_back(lyx::to_utf8(_("Width")));
+	gui_names.push_back(_("None"));
+	gui_names.push_back(_("Height"));
+	gui_names.push_back(_("Depth"));
+	gui_names.push_back(_("Total Height"));
+	gui_names.push_back(_("Width"));
 }
 
 } // namespace frontend
diff --git a/src/frontends/controllers/ControlBox.h b/src/frontends/controllers/ControlBox.h
index 147911d7d2..85b92a0033 100644
--- a/src/frontends/controllers/ControlBox.h
+++ b/src/frontends/controllers/ControlBox.h
@@ -45,10 +45,10 @@ private:
 };
 
 ///
-void box_gui_tokens(std::vector<std::string> &, std::vector<std::string> &);
+void box_gui_tokens(std::vector<std::string> &, std::vector<docstring> &);
 ///
 void box_gui_tokens_special_length(std::vector<std::string> &,
-	std::vector<std::string> &);
+	std::vector<docstring> &);
 
 } // namespace frontend
 } // namespace lyx
diff --git a/src/frontends/qt4/QBox.h b/src/frontends/qt4/QBox.h
index c5e2d60c73..b544e7da43 100644
--- a/src/frontends/qt4/QBox.h
+++ b/src/frontends/qt4/QBox.h
@@ -45,11 +45,11 @@ private:
 	///
 	std::vector<std::string> ids_;
 	///
-	std::vector<std::string> gui_names_;
+	std::vector<docstring> gui_names_;
 	///
 	std::vector<std::string> ids_spec_;
 	///
-	std::vector<std::string> gui_names_spec_;
+	std::vector<docstring> gui_names_spec_;
 };
 
 } // namespace frontend