Fix bug 3101 and 3108

[lyx.git] / src / kbsequence.h

diff --git a/src/kbsequence.h b/src/kbsequence.h
index 3d894a1ec31c54d1fe602cb7db77656a7d757095..6dc269a0357687f9f3e343c8927992a5a4036848 100644 (file)
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -14,20 +14,20 @@
 #define KBSEQUENCE_H
 
 #include "frontends/key_state.h"
-
-#include <boost/shared_ptr.hpp>
+#include "frontends/LyXKeySym.h"
 
 #include <string>
 #include <vector>
 
+
+namespace lyx {
+
 class kb_keymap;
-class LyXKeySym;
 class FuncRequest;
 
 /// Holds a key sequence and the current and standard keymaps
 class kb_sequence {
 public:
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
        typedef std::vector<LyXKeySymPtr> KeySequence;
 
        friend class kb_keymap;
@@ -63,15 +63,19 @@ public:
 
        /**
         * Return the current sequence as a string.
+        * @param forgui true if the string should use translations and 
+        *   special characters. 
         * @see parse()
         */
-       std::string const print() const;
+       docstring const print(bool forgui) const;
 
        /**
         * Return the current sequence and available options as
         * a string. No options are added if no curmap kb map exists.
+        * @param forgui true if the string should use translations and 
+        *   special characters. 
         */
-       std::string const printOptions() const;
+       docstring const printOptions(bool forgui) const;
 
        /// Mark the sequence as deleted.
        void mark_deleted();
@@ -114,4 +118,7 @@ private:
        bool deleted_;
 };
 
+
+} // namespace lyx
+
 #endif