fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlChanges.h b/src/frontends/controllers/ControlChanges.h
index 3674a5439d9040c63c0dfc16b8d4766a9764ba72..f146befa450ed5e0836ca83444d1a4f844c59e14 100644 (file)
--- a/src/frontends/controllers/ControlChanges.h
+++ b/src/frontends/controllers/ControlChanges.h
@@ -6,7 +6,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef CONTROLCHANGES_H
@@ -14,6 +14,9 @@
 
 #include "Dialog.h"
 
+namespace lyx {
+namespace frontend {
+
 /**
  * A controller for the merge changes dialog.
  */
@@ -21,29 +24,34 @@ class ControlChanges : public Dialog::Controller {
 public:
        ///
        ControlChanges(Dialog &);
-       ///
-       virtual bool initialiseParams(string const &) { return true; }
+       /// Nothing to initialise in this case.
+       virtual bool initialiseParams(std::string const &) { return true; }
        ///
        virtual void clearParams() {}
        ///
        virtual void dispatchParams() {}
        ///
        virtual bool isBufferDependent() const { return true; }
+       /// always true since dispatchParams() is empty
+       virtual bool canApply() const { return true; }
 
        /// find the next merge chunk and highlight it
        bool find();
 
        /// return date of change
-       string const getChangeDate();
+       std::string const getChangeDate();
 
        /// return author of change
-       string const getChangeAuthor();
+       std::string const getChangeAuthor();
 
        /// accept the current merge
-       void accept();
+       bool accept();
 
        /// reject the current merge
-       void reject();
+       bool reject();
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // CONTROLCHANGES_H