From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Sat, 11 Nov 2006 21:09:51 +0000 (+0000)
Subject: unicode: ditch another utf8 roundtrip + some obsolete FIXMEs
X-Git-Tag: 1.6.10~11926
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=de38acaef01f0ede0fd9d6f473b067151e64f1c2;p=features.git

unicode: ditch another utf8 roundtrip + some obsolete FIXMEs


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

diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index 3052fffead..d5e1fdb86d 100644
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -110,7 +110,6 @@ bool ControlSpellchecker::initialiseParams(std::string const &)
 	bool const success = speller_->error().empty();
 
 	if (!success) {
-		// FIXME UNICODE
 		Alert::error(_("Spellchecker error"),
 			     _("The spellchecker could not be started\n")
 			     + speller_->error());
@@ -288,7 +287,6 @@ void ControlSpellchecker::showSummary()
 	}
 
 	docstring message;
-	// FIXME UNICODE
 	if (count_ != 1)
 		message = bformat(_("%1$d words checked."), count_);
 	else
diff --git a/src/frontends/qt4/QBibtexDialog.C b/src/frontends/qt4/QBibtexDialog.C
index cd014460a4..ed5d774b6a 100644
--- a/src/frontends/qt4/QBibtexDialog.C
+++ b/src/frontends/qt4/QBibtexDialog.C
@@ -148,7 +148,7 @@ void QBibtexDialog::browseBibPressed()
 
 	if (!file.empty()) {
 		// FIXME UNICODE
-		QString const f = toqstr(from_utf8(changeExtension(to_utf8(file), "")));
+		QString const f = toqstr(changeExtension(to_utf8(file), ""));
 		bool present = false;
 
 		for (int i = 0; i < add_->bibLW->count(); ++i) {
diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index aa11692071..c26131e21e 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -149,7 +149,6 @@ void InsetBox::setButtonLabel()
 	BoxType btype = boxtranslator().find(params_.type);
 
 	docstring label;
-	// FIXME UNICODE
 	label += _("Box");
 	label += " (";
 	if (btype == Frameless) {
@@ -158,7 +157,7 @@ void InsetBox::setButtonLabel()
 		else
 			label += _("Minipage");
 	} else
-		// FXIME unicode
+		// FIXME UNICODE
 		label += from_utf8(boxtranslator_loc().find(btype));
 	label += ")";
 
diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index f3bfeffcd2..5d66cef436 100644
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -394,7 +394,6 @@ string const cleanupWhitespace(string const & citelist)
 
 int InsetCitation::docbook(Buffer const &, odocstream & os, OutputParams const &) const
 {
-        // FIXME UNICODE
 	os << "<citation>"
            << from_ascii(cleanupWhitespace(getContents()))
            << "</citation>";
diff --git a/src/undo.C b/src/undo.C
index fa377c3e54..b60d0e11b9 100644
--- a/src/undo.C
+++ b/src/undo.C
@@ -96,7 +96,7 @@ void doRecordUndo(Undo::undo_kind kind,
 	// fill in the real data to be saved
 	if (cell.inMathed()) {
 		// simply use the whole cell
-		undo.array = to_utf8(asString(cell.cell()));
+		undo.array = asString(cell.cell());
 	} else {
 		// some more effort needed here as 'the whole cell' of the
 		// main LyXText _is_ the whole document.
@@ -170,8 +170,7 @@ bool textUndoOrRedo(BufferView & bv,
 		// gained by storing just 'a few' paragraphs (most if not
 		// all math inset cells have just one paragraph!)
 		//lyxerr << "undo.array=" << undo.array <<endl;
-		// FIXME UNICODE
-		asArray(from_utf8(undo.array), dit.cell());
+		asArray(undo.array, dit.cell());
 	} else {
 		// Some finer machinery is needed here.
 		LyXText * text = dit.text();
diff --git a/src/undo.h b/src/undo.h
index 519b21252a..8ce44ce962 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -85,7 +85,7 @@ public:
 	/// the contents of the saved Paragraphs (for texted)
 	ParagraphList pars;
 	/// the stringified contents of the saved MathArray (for mathed)
-	std::string array;
+	docstring array;
 	/// Only used in case of full backups
 	BufferParams bparams;
 	/// Only used in case of full backups