anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unicode: ditch another utf8 roundtrip + some obsolete FIXMEs

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15866 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-11-11 21:09:51 +00:00
parent a956cc56e6
commit de38acaef0
6 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/controllers/ControlSpellchecker.C
View File

@ -110,7 +110,6 @@ bool ControlSpellchecker::initialiseParams(std::string const &)
bool const success = speller_->error().empty(); bool const success = speller_->error().empty();
if (!success) { if (!success) {
// FIXME UNICODE
Alert::error(_("Spellchecker error"), Alert::error(_("Spellchecker error"),
_("The spellchecker could not be started\n") _("The spellchecker could not be started\n")
+ speller_->error()); + speller_->error());
@ -288,7 +287,6 @@ void ControlSpellchecker::showSummary()
} }
docstring message; docstring message;
// FIXME UNICODE
if (count_ != 1) if (count_ != 1)
message = bformat(_("%1$d words checked."), count_); message = bformat(_("%1$d words checked."), count_);
else else

2
src/frontends/qt4/QBibtexDialog.C
View File

@ -148,7 +148,7 @@ void QBibtexDialog::browseBibPressed()
if (!file.empty()) { if (!file.empty()) {
// FIXME UNICODE // FIXME UNICODE
QString const f = toqstr(from_utf8(changeExtension(to_utf8(file), ""))); QString const f = toqstr(changeExtension(to_utf8(file), ""));
bool present = false; bool present = false;
for (int i = 0; i < add_->bibLW->count(); ++i) { for (int i = 0; i < add_->bibLW->count(); ++i) {

3
src/insets/insetbox.C
View File

@ -149,7 +149,6 @@ void InsetBox::setButtonLabel()
BoxType btype = boxtranslator().find(params_.type); BoxType btype = boxtranslator().find(params_.type);
docstring label; docstring label;
// FIXME UNICODE
label += _("Box"); label += _("Box");
label += " ("; label += " (";
if (btype == Frameless) { if (btype == Frameless) {
@ -158,7 +157,7 @@ void InsetBox::setButtonLabel()
else else
label += _("Minipage"); label += _("Minipage");
} else } else
// FXIME unicode // FIXME UNICODE
label += from_utf8(boxtranslator_loc().find(btype)); label += from_utf8(boxtranslator_loc().find(btype));
label += ")"; label += ")";

1
src/insets/insetcite.C
View File

@ -394,7 +394,6 @@ string const cleanupWhitespace(string const & citelist)
int InsetCitation::docbook(Buffer const &, odocstream & os, OutputParams const &) const int InsetCitation::docbook(Buffer const &, odocstream & os, OutputParams const &) const
{ {
// FIXME UNICODE
os << "<citation>" os << "<citation>"
<< from_ascii(cleanupWhitespace(getContents())) << from_ascii(cleanupWhitespace(getContents()))
<< "</citation>"; << "</citation>";

5
src/undo.C
View File

@ -96,7 +96,7 @@ void doRecordUndo(Undo::undo_kind kind,
// fill in the real data to be saved // fill in the real data to be saved
if (cell.inMathed()) { if (cell.inMathed()) {
// simply use the whole cell // simply use the whole cell
undo.array = to_utf8(asString(cell.cell())); undo.array = asString(cell.cell());
} else { } else {
// some more effort needed here as 'the whole cell' of the // some more effort needed here as 'the whole cell' of the
// main LyXText _is_ the whole document. // main LyXText _is_ the whole document.
@ -170,8 +170,7 @@ bool textUndoOrRedo(BufferView & bv,
// gained by storing just 'a few' paragraphs (most if not // gained by storing just 'a few' paragraphs (most if not
// all math inset cells have just one paragraph!) // all math inset cells have just one paragraph!)
//lyxerr << "undo.array=" << undo.array <<endl; //lyxerr << "undo.array=" << undo.array <<endl;
// FIXME UNICODE asArray(undo.array, dit.cell());
asArray(from_utf8(undo.array), dit.cell());
} else { } else {
// Some finer machinery is needed here. // Some finer machinery is needed here.
LyXText * text = dit.text(); LyXText * text = dit.text();

2
src/undo.h
View File

@ -85,7 +85,7 @@ public:
/// the contents of the saved Paragraphs (for texted) /// the contents of the saved Paragraphs (for texted)
ParagraphList pars; ParagraphList pars;
/// the stringified contents of the saved MathArray (for mathed) /// the stringified contents of the saved MathArray (for mathed)
std::string array; docstring array;
/// Only used in case of full backups /// Only used in case of full backups
BufferParams bparams; BufferParams bparams;
/// Only used in case of full backups /// Only used in case of full backups