convert author names and status messages to docstring

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

diff --git a/src/frontends/controllers/ControlCommandBuffer.h b/src/frontends/controllers/ControlCommandBuffer.h
index 4cbf30721e505ae7851a47bf2452dc5a5b28e95d..b1e413411e50f7f4e524299ce3f9b7926c666022 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.h
+++ b/src/frontends/controllers/ControlCommandBuffer.h
@@ -5,7 +5,7 @@
  * 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.
@@ -14,13 +14,17 @@
 #ifndef CONTROLCOMMANDBUFFER_H
 #define CONTROLCOMMANDBUFFER_H
 
-#include "support/std_string.h"
+#include "support/docstring.h"
 
 #include <vector>
 
 
+namespace lyx {
+
 class LyXView;
 
+namespace frontend {
+
 /**
  * ControlCommandBuffer
  *
@@ -32,32 +36,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;
+       docstring 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