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 6e0b360eec491714e9ef48faea4a64a928f63cb0..5d8c2e2259b69d7183a9e8a91cd0dcf934fd0781 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -31,12 +31,10 @@ using std::ostringstream;
 using std::pair;
 using std::string;
 using std::vector;
-
+using lyx::support::FileFilterList;
 
 namespace lyx {
 
-using support::FileFilterList;
-
 namespace frontend {
 
 
@@ -49,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;
 
@@ -67,15 +65,16 @@ void ControlPrefs::dispatchParams()
        kernel().dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
 
        // FIXME: these need lfuns
-       theBufferList().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();