convert author names and status messages to docstring

[lyx.git] / src / frontends / controllers / ControlPrefs.C

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 221fe03a91aee1b5f7d186a7337499ee2a82c15b..5d8c2e2259b69d7183a9e8a91cd0dcf934fd0781 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -15,27 +15,26 @@
 #include "helper_funcs.h"
 #include "Kernel.h"
 
+#include "bufferlist.h"
 #include "gettext.h"
 #include "funcrequest.h"
 #include "paper.h"
 #include "LColor.h"
 
-#include "frontends/Application.h"
-
 #include "support/filefilterlist.h"
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::ostringstream;
 using std::pair;
 using std::string;
 using std::vector;
-
+using lyx::support::FileFilterList;
 
 namespace lyx {
 
-using support::FileFilterList;
-
 namespace frontend {
 
 
@@ -48,10 +47,10 @@ ControlPrefs::ControlPrefs(Dialog & parent)
 bool ControlPrefs::initialiseParams(std::string const &)
 {
        rc_ = lyxrc;
-       formats_ = ::formats;
-       converters_ = ::converters;
+       formats_ = lyx::formats;
+       converters_ = lyx::converters;
        converters_.update(formats_);
-       movers_ = ::movers;
+       movers_ = lyx::movers;
        colors_.clear();
        update_screen_font_ = false;
 
@@ -66,15 +65,16 @@ void ControlPrefs::dispatchParams()
        kernel().dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
 
        // FIXME: these need lfuns
-       theApp->bufferList().setCurrentAuthor(rc_.user_name, rc_.user_email);
+       // FIXME UNICODE
+       theBufferList().setCurrentAuthor(from_utf8(rc_.user_name), from_utf8(rc_.user_email));
 
-       ::formats = formats_;
+       lyx::formats = formats_;
 
-       ::converters = converters_;
-       ::converters.update(::formats);
-       ::converters.buildGraph();
+       lyx::converters = converters_;
+       lyx::converters.update(lyx::formats);
+       lyx::converters.buildGraph();
 
-       ::movers = movers_;
+       lyx::movers = movers_;
 
        vector<string>::const_iterator it = colors_.begin();
        vector<string>::const_iterator const end = colors_.end();
@@ -106,51 +106,47 @@ void ControlPrefs::updateScreenFonts()
 }
 
 
-string const ControlPrefs::browsebind(string const & file) const
+docstring const ControlPrefs::browsebind(docstring const & file) const
 {
-       // FIXME UNICODE
-       return browseLibFile("bind", file, "bind",
-                            lyx::to_utf8(_("Choose bind file")),
-                            FileFilterList(lyx::to_utf8(_("LyX bind files (*.bind)"))));
+       return browseLibFile(lyx::from_ascii("bind"), file, lyx::from_ascii("bind"),
+                            _("Choose bind file"),
+                            FileFilterList(_("LyX bind files (*.bind)")));
 }
 
 
-string const ControlPrefs::browseUI(string const & file) const
+docstring const ControlPrefs::browseUI(docstring const & file) const
 {
-       // FIXME UNICODE
-       return browseLibFile("ui", file, "ui",
-                            lyx::to_utf8(_("Choose UI file")),
-                            FileFilterList(lyx::to_utf8(_("LyX UI files (*.ui)"))));
+       return browseLibFile(lyx::from_ascii("ui"), file, lyx::from_ascii("ui"),
+                            _("Choose UI file"),
+                            FileFilterList(_("LyX UI files (*.ui)")));
 }
 
 
-string const ControlPrefs::browsekbmap(string const & file) const
+docstring const ControlPrefs::browsekbmap(docstring const & file) const
 {
-       // FIXME UNICODE
-       return browseLibFile("kbd", file, "kmap",
-                            lyx::to_utf8(_("Choose keyboard map")),
-                            FileFilterList(lyx::to_utf8(_("LyX keyboard maps (*.kmap)"))));
+       return browseLibFile(lyx::from_ascii("kbd"), file, lyx::from_ascii("kmap"),
+                            _("Choose keyboard map"),
+                            FileFilterList(_("LyX keyboard maps (*.kmap)")));
 }
 
 
-string const ControlPrefs::browsedict(string const & file) const
+docstring const ControlPrefs::browsedict(docstring const & file) const
 {
-       // FIXME UNICODE
        return browseFile(file,
-                         lyx::to_utf8(_("Choose personal dictionary")),
-                         FileFilterList(lyx::to_utf8(_("*.ispell"))));
+                         _("Choose personal dictionary"),
+                         FileFilterList(_("*.ispell")));
 }
 
 
-string const ControlPrefs::browse(string const & file,
-                                 string const & title) const
+docstring const ControlPrefs::browse(docstring const & file,
+                                 docstring const & title) const
 {
        return browseFile(file, title, FileFilterList(), true);
 }
 
 
-string const ControlPrefs::browsedir(string const & path,
-                                    string const & title) const
+docstring const ControlPrefs::browsedir(docstring const & path,
+                                    docstring const & title) const
 {
        return browseDir(path, title);
 }