Revert change in rev. 15955 because as Georg says:

[lyx.git] / src / kbsequence.h

diff --git a/src/kbsequence.h b/src/kbsequence.h
index 5bb5139862f93bddd4650c5d3a6ee2fbe651199d..036cdcf43bce7efd56e79b0d170cdce8b1d7170f 100644 (file)
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -14,20 +14,20 @@
 #define KBSEQUENCE_H
 
 #include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
 
-#include <boost/shared_ptr.hpp>
-
-#include "support/std_string.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;
@@ -59,19 +59,19 @@ public:
         * Prefixes can also be ignored by using the Tilde "~"
         * f.ex.: "~S-Space".
         */
-       string::size_type parse(string const & s);
+       std::string::size_type parse(std::string const & s);
 
        /**
         * Return the current sequence as a string.
         * @see parse()
         */
-       string const print() const;
+       std::string const print() const;
 
        /**
         * Return the current sequence and available options as
         * a string. No options are added if no curmap kb map exists.
         */
-       string const printOptions() const;
+       std::string const printOptions() const;
 
        /// Mark the sequence as deleted.
        void mark_deleted();
@@ -114,4 +114,7 @@ private:
        bool deleted_;
 };
 
+
+} // namespace lyx
+
 #endif