fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlChanges.C b/src/frontends/controllers/ControlChanges.C
index 4af90eeb8074aabbd0e9c90b902cf501b9b69aa1..ea6b8909cf621543a8136023dded6da3a4136c78 100644 (file)
--- a/src/frontends/controllers/ControlChanges.C
+++ b/src/frontends/controllers/ControlChanges.C
@@ -19,9 +19,14 @@
 #include "changes.h"
 #include "funcrequest.h"
 #include "lyxfind.h"
-#include "support/lstrings.h"
+#include "support/lyxtime.h"
+
+using std::string;
+
+namespace lyx {
+
+namespace frontend {
 
-using namespace lyx::support;
 
 ControlChanges::ControlChanges(Dialog & parent)
        : Dialog::Controller(parent)
@@ -30,7 +35,7 @@ ControlChanges::ControlChanges(Dialog & parent)
 
 bool ControlChanges::find()
 {
-       return lyx::find::findNextChange(kernel().bufferview());
+       return find::findNextChange(kernel().bufferview());
 }
 
 
@@ -40,9 +45,7 @@ string const ControlChanges::getChangeDate()
        if (c.type == Change::UNCHANGED || !c.changetime)
                return string();
 
-       // ctime adds newline; trim it off!
-       string const date = rtrim(ctime(&c.changetime), "\n");
-       return date;
+       return formatted_time(c.changetime);
 }
 
 
@@ -65,15 +68,19 @@ string const ControlChanges::getChangeAuthor()
 }
 
 
-void ControlChanges::accept()
+bool ControlChanges::accept()
 {
        kernel().dispatch(FuncRequest(LFUN_ACCEPT_CHANGE));
-       lyx::find::findNextChange(kernel().bufferview());
+       return find::findNextChange(kernel().bufferview());
 }
 
 
-void ControlChanges::reject()
+bool ControlChanges::reject()
 {
        kernel().dispatch(FuncRequest(LFUN_REJECT_CHANGE));
-       lyx::find::findNextChange(kernel().bufferview());
+       return find::findNextChange(kernel().bufferview());
 }
+
+
+} // namespace frontend
+} // namespace lyx