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 4503434ee32105564b9b9bda453a782a2e4a5408..9c67cc57c50cfec7a713526fe254f5e9d6421c96 100644 (file)
--- a/src/frontends/controllers/ControlChanges.C
+++ b/src/frontends/controllers/ControlChanges.C
@@ -35,7 +35,7 @@ ControlChanges::ControlChanges(Dialog & parent)
 
 bool ControlChanges::find()
 {
-       return find::findNextChange(kernel().bufferview());
+       return findNextChange(kernel().bufferview());
 }
 
 
@@ -46,29 +46,31 @@ bool ControlChanges::changed()
 }
 
 
-string const ControlChanges::getChangeDate()
+docstring const ControlChanges::getChangeDate()
 {
        Change c(kernel().bufferview()->getCurrentChange());
        if (c.type == Change::UNCHANGED || !c.changetime)
-               return string();
+               return docstring();
 
-       return formatted_time(c.changetime);
+       // FIXME UNICODE
+       return from_utf8(formatted_time(c.changetime));
 }
 
 
-string const ControlChanges::getChangeAuthor()
+docstring const ControlChanges::getChangeAuthor()
 {
        Change c(kernel().bufferview()->getCurrentChange());
        if (c.type == Change::UNCHANGED)
-               return string();
+               return docstring();
 
        Author const & a(kernel().buffer().params().authors().get(c.author));
 
-       string author(a.name());
+       docstring author(a.name());
 
        if (!a.email().empty()) {
                author += " (";
-               author += a.email() + ")";
+               author += a.email();
+               author += ")";
        }
 
        return author;
@@ -78,14 +80,14 @@ string 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());
 }