convert author names and status messages to docstring

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

diff --git a/src/frontends/controllers/ControlChanges.C b/src/frontends/controllers/ControlChanges.C
index 15adecb629ab8b2456e732e5346a5e490c2ccb55..9c67cc57c50cfec7a713526fe254f5e9d6421c96 100644 (file)
--- a/src/frontends/controllers/ControlChanges.C
+++ b/src/frontends/controllers/ControlChanges.C
@@ -21,8 +21,6 @@
 #include "lyxfind.h"
 #include "support/lyxtime.h"
 
-using lyx::docstring;
-
 using std::string;
 
 namespace lyx {
@@ -37,7 +35,7 @@ ControlChanges::ControlChanges(Dialog & parent)
 
 bool ControlChanges::find()
 {
-       return find::findNextChange(kernel().bufferview());
+       return findNextChange(kernel().bufferview());
 }
 
 
@@ -55,7 +53,7 @@ docstring const ControlChanges::getChangeDate()
                return docstring();
 
        // FIXME UNICODE
-       return lyx::from_utf8(formatted_time(c.changetime));
+       return from_utf8(formatted_time(c.changetime));
 }
 
 
@@ -67,12 +65,11 @@ docstring const ControlChanges::getChangeAuthor()
 
        Author const & a(kernel().buffer().params().authors().get(c.author));
 
-       // FIXME UNICODE in Author class
-       docstring author(lyx::from_utf8(a.name()));
+       docstring author(a.name());
 
        if (!a.email().empty()) {
                author += " (";
-               author += lyx::from_utf8(a.email());
+               author += a.email();
                author += ")";
        }
 
@@ -83,14 +80,14 @@ docstring const ControlChanges::getChangeAuthor()
 bool ControlChanges::accept()
 {
        kernel().dispatch(FuncRequest(LFUN_CHANGE_ACCEPT));
-       return find::findNextChange(kernel().bufferview());
+       return findNextChange(kernel().bufferview());
 }
 
 
 bool ControlChanges::reject()
 {
        kernel().dispatch(FuncRequest(LFUN_CHANGE_REJECT));
-       return find::findNextChange(kernel().bufferview());
+       return findNextChange(kernel().bufferview());
 }