fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlCommandBuffer.h b/src/frontends/controllers/ControlCommandBuffer.h
index 608a80ce5a41b3f04310316009143fa43c1c792a..0beb3a10e87940e197a1940082d3e1c021cc1301 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.h
+++ b/src/frontends/controllers/ControlCommandBuffer.h
@@ -5,22 +5,24 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars
- * \author Asger and Juergen
+ * \author Asger and Jürgen
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef CONTROLCOMMANDBUFFER_H
 #define CONTROLCOMMANDBUFFER_H
 
-#include "LString.h"
-
+#include <string>
 #include <vector>
 
 
 class LyXView;
 
+namespace lyx {
+namespace frontend {
+
 /**
  * ControlCommandBuffer
  *
@@ -32,32 +34,35 @@ public:
        ControlCommandBuffer(LyXView & lv);
 
        /// return the previous history entry if any
-       string const historyUp();
+       std::string const historyUp();
 
        /// return the next history entry if any
-       string const historyDown();
+       std::string const historyDown();
 
        /// return the font and depth in the active BufferView as a message.
-       string const getCurrentState() const;
+       std::string const getCurrentState() const;
 
        /// return the possible completions
-       std::vector<string> const completions(string const & prefix,
-                                             string & new_prefix);
+       std::vector<std::string> const completions(std::string const & prefix,
+                                             std::string & new_prefix);
 
        /// dispatch a command
-       void dispatch(string const & str);
+       void dispatch(std::string const & str);
 private:
        /// controlling LyXView
        LyXView & lv_;
 
        /// available command names
-       std::vector<string> commands_;
+       std::vector<std::string> commands_;
 
        /// command history
-       std::vector<string> history_;
+       std::vector<std::string> history_;
 
        /// current position in command history
-       std::vector<string>::const_iterator history_pos_;
+       std::vector<std::string>::const_iterator history_pos_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // CONTROLCOMMANDBUFFER_H