X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.h;h=036cdcf43bce7efd56e79b0d170cdce8b1d7170f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=2c46672c9fc64613b5302224ecd7c67b3c058d80;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/kbsequence.h b/src/kbsequence.h
index 2c46672c9f..036cdcf43b 100644
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -15,10 +15,15 @@
 
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
-#include "LString.h"
+
+#include <string>
 #include <vector>
 
+
+namespace lyx {
+
 class kb_keymap;
+class FuncRequest;
 
 /// Holds a key sequence and the current and standard keymaps
 class kb_sequence {
@@ -39,8 +44,9 @@ public:
 	 * @param nmod which modifiers to mask out for equality test
 	 * @return the action matching this key sequence or LFUN_UNKNOWN_ACTION
 	 */
-	int addkey(LyXKeySymPtr keysym, key_modifier::state mod,
-		   key_modifier::state nmod = key_modifier::none);
+	FuncRequest const &
+	addkey(LyXKeySymPtr keysym, key_modifier::state mod,
+	       key_modifier::state nmod = key_modifier::none);
 
 	/**
 	 * Add a sequence of keys from a string to the sequence
@@ -53,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();
@@ -108,4 +114,7 @@ private:
 	bool deleted_;
 };
 
+
+} // namespace lyx
+
 #endif