get rid of more utf8 conversions

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

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 6313b7842bf03d60085fa24ac4052931dea5e062..beaaa0cf711249e73ba6d2381f0c07b54d9e8f87 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -627,7 +627,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf)
                docstring const label = from_utf8(cit->name);
                tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_CHARSTYLE_INSERT,
-                                               cit->name)));
+                                               label)));
        }
 }
 

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index b42ef8fb314a5b38e932f79f83c03d99a0dde603..7683609af62dc07786901cfb17c8e2ae88653726 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -131,8 +131,7 @@ void ControlDocument::dispatchParams()
                        string const x11hexname =
                                        lyx::X11hexname(branch->getColor());
                        // display the new color
-                       // FIXME UNICODE
-                       string const str = to_utf8(current_branch) + ' ' + x11hexname;
+                       docstring const str = current_branch + ' ' + from_ascii(x11hexname);
                        kernel().dispatch(FuncRequest(LFUN_SET_COLOR, str));
                }
 

diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index 638bdf9338c12d430af6fd5bf8ff1b371ca5c49f..1c3bee9ad7a5b2f7ff871353c167ff11743c12c8 100644 (file)
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -49,16 +49,16 @@ vector<LanguagePair> const getLanguageData(bool character_dlg)
        vector<LanguagePair> langs(size);
 
        if (character_dlg) {
-               langs[0].first = lyx::to_utf8(_("No change"));
+               langs[0].first = _("No change");
                langs[0].second = "ignore";
-               langs[1].first = lyx::to_utf8(_("Reset"));
+               langs[1].first = _("Reset");
                langs[1].second = "reset";
        }
 
        vector<string>::size_type i = character_dlg ? 2 : 0;
        for (Languages::const_iterator cit = languages.begin();
             cit != languages.end(); ++cit) {
-               langs[i].first  = lyx::to_utf8(_(cit->second.display()));
+               langs[i].first  = _(cit->second.display());
                langs[i].second = cit->second.lang();
                ++i;
        }

diff --git a/src/frontends/controllers/frnt_lang.h b/src/frontends/controllers/frnt_lang.h
index c57f3ebaf2e568c22d4b1650b44cf94837116ab4..c79ef4467aabd386890c4414924162fe45aa8d55 100644 (file)
--- a/src/frontends/controllers/frnt_lang.h
+++ b/src/frontends/controllers/frnt_lang.h
@@ -14,7 +14,8 @@
 #ifndef FRNT_LANG_H
 #define FRNT_LANG_H
 
-#include <string>
+#include "support/docstring.h"
+
 #include <utility>
 #include <vector>
 
@@ -22,7 +23,7 @@ namespace lyx {
 namespace frontend {
 
 ///
-typedef std::pair<std::string, std::string> LanguagePair;
+typedef std::pair<docstring, std::string> LanguagePair;
 
 /** If the caller is the character dialog, add "No change" and "Reset"
  *  to the vector.

diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index f770a33230b2f99be30d0f1473f3c06827d747f3..fe00adca4071e418689caddc52e6d0b1c4ba3b05 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -1496,7 +1496,6 @@ PrefLanguage::PrefLanguage(QWidget * parent)
        defaultLanguageCO->clear();
 
        // store the lang identifiers for later
-       using lyx::frontend::LanguagePair;
        std::vector<LanguagePair> const langs =
                lyx::frontend::getLanguageData(false);
        lang_ = getSecond(langs);

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index e5be700ae43f1b8afa81e8e50e1c9fa91cb4ee8f..5dd54a26189fddd2397d91be0a9d584fbea14106 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -44,6 +44,7 @@ using std::endl;
 namespace {
 
 typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
 
 BoxTranslator const init_boxtranslator()
 {
@@ -57,15 +58,14 @@ BoxTranslator const init_boxtranslator()
 }
 
 
-BoxTranslator const init_boxtranslator_loc()
+BoxTranslatorLoc const init_boxtranslator_loc()
 {
-       // FIXME UNICODE
-       BoxTranslator translator(to_utf8(_("Boxed")), InsetBox::Boxed);
-       translator.addPair(to_utf8(_("Frameless")), InsetBox::Frameless);
-       translator.addPair(to_utf8(_("ovalbox")), InsetBox::ovalbox);
-       translator.addPair(to_utf8(_("Ovalbox")), InsetBox::Ovalbox);
-       translator.addPair(to_utf8(_("Shadowbox")), InsetBox::Shadowbox);
-       translator.addPair(to_utf8(_("Doublebox")), InsetBox::Doublebox);
+       BoxTranslatorLoc translator(_("Boxed"), InsetBox::Boxed);
+       translator.addPair(_("Frameless"), InsetBox::Frameless);
+       translator.addPair(_("ovalbox"), InsetBox::ovalbox);
+       translator.addPair(_("Ovalbox"), InsetBox::Ovalbox);
+       translator.addPair(_("Shadowbox"), InsetBox::Shadowbox);
+       translator.addPair(_("Doublebox"), InsetBox::Doublebox);
        return translator;
 }
 
@@ -77,9 +77,9 @@ BoxTranslator const & boxtranslator()
 }
 
 
-BoxTranslator const & boxtranslator_loc()
+BoxTranslatorLoc const & boxtranslator_loc()
 {
-       static BoxTranslator translator = init_boxtranslator_loc();
+       static BoxTranslatorLoc translator = init_boxtranslator_loc();
        return translator;
 }
 
@@ -157,8 +157,7 @@ void InsetBox::setButtonLabel()
                else
                        label += _("Minipage");
        } else
-               // FIXME UNICODE
-               label += from_utf8(boxtranslator_loc().find(btype));
+               label += boxtranslator_loc().find(btype);
        label += ")";
 
        setLabel(label);

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index d9ef2f787b4f81ada85c06bba74170ac8ff13636..b840955032cdb0b16831769f57f38ed2e1158825 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -47,6 +47,7 @@ using std::ostringstream;
 namespace {
 
 typedef Translator<std::string, InsetNoteParams::Type> NoteTranslator;
+typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
 
 NoteTranslator const init_notetranslator()
 {
@@ -59,14 +60,13 @@ NoteTranslator const init_notetranslator()
 }
 
 
-NoteTranslator const init_notetranslator_loc()
+NoteTranslatorLoc const init_notetranslator_loc()
 {
-       // FIXME UNICODE
-       NoteTranslator translator(to_utf8(_("Note")), InsetNoteParams::Note);
-       translator.addPair(to_utf8(_("Comment")), InsetNoteParams::Comment);
-       translator.addPair(to_utf8(_("Greyed out")), InsetNoteParams::Greyedout);
-       translator.addPair(to_utf8(_("Framed")), InsetNoteParams::Framed);
-       translator.addPair(to_utf8(_("Shaded")), InsetNoteParams::Shaded);
+       NoteTranslatorLoc translator(_("Note"), InsetNoteParams::Note);
+       translator.addPair(_("Comment"), InsetNoteParams::Comment);
+       translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout);
+       translator.addPair(_("Framed"), InsetNoteParams::Framed);
+       translator.addPair(_("Shaded"), InsetNoteParams::Shaded);
        return translator;
 }
 
@@ -78,9 +78,9 @@ NoteTranslator const & notetranslator()
 }
 
 
-NoteTranslator const & notetranslator_loc()
+NoteTranslatorLoc const & notetranslator_loc()
 {
-       static NoteTranslator translator = init_notetranslator_loc();
+       static NoteTranslatorLoc translator = init_notetranslator_loc();
        return translator;
 }
 
@@ -112,7 +112,7 @@ void InsetNoteParams::read(LyXLex & lex)
 
 void InsetNote::init()
 {
-       setInsetName(from_utf8("Note"));
+       setInsetName(from_ascii("Note"));
        setButtonLabel();
 }
 
@@ -167,8 +167,7 @@ void InsetNote::read(Buffer const & buf, LyXLex & lex)
 
 void InsetNote::setButtonLabel()
 {
-       // FIXME unicode
-       docstring const label = from_utf8(notetranslator_loc().find(params_.type));
+       docstring const label = notetranslator_loc().find(params_.type);
        setLabel(label);
 
        LyXFont font(LyXFont::ALL_SANE);

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index f8fe702f076bdc9281e0902e06f0808f2ed4c64f..bb47af70de7863d605c16735c200c64465d61fda 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1757,27 +1757,27 @@ void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd
        if (!dispatch_msg.empty())
                dispatch_msg += ' ';
 
-       string comname = lyxaction.getActionName(cmd.action);
+       docstring comname = from_utf8(lyxaction.getActionName(cmd.action));
 
        bool argsadded = false;
 
        if (!cmd.argument().empty()) {
                if (cmd.action != LFUN_UNKNOWN_ACTION) {
-                       comname += ' ' + to_utf8(cmd.argument());
+                       comname += ' ' + cmd.argument();
                        argsadded = true;
                }
        }
 
-       string const shortcuts = to_utf8(theTopLevelKeymap().printbindings(cmd));
+       docstring const shortcuts = theTopLevelKeymap().printbindings(cmd);
 
        if (!shortcuts.empty())
                comname += ": " + shortcuts;
        else if (!argsadded && !cmd.argument().empty())
-               comname += ' ' + to_utf8(cmd.argument());
+               comname += ' ' + cmd.argument();
 
        if (!comname.empty()) {
                comname = rtrim(comname);
-               dispatch_msg += from_utf8('(' + rtrim(comname) + ')');
+               dispatch_msg += '(' + rtrim(comname) + ')';
        }
 
        lyxerr[Debug::ACTION] << "verbose dispatch msg "