X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.h;h=029a4e1b4eafcf406187ddd9b9eb132a77629a3d;hb=6b55f26eb828a98ab71596b0ca83d9cdb9aa7607;hp=d342510b0c6bb59c62d23b063ab1feec258c8855;hpb=3b44c08e43ba2bc0ef97c291d4c5a19819e32ab5;p=lyx.git

diff --git a/src/kbmap.h b/src/kbmap.h
index d342510b0c..029a4e1b4e 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -19,11 +19,16 @@
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
 
+#include "support/docstream.h"
+
 #include <boost/shared_ptr.hpp>
 
 #include <vector>
 #include <deque>
 
+
+namespace lyx {
+
 class kb_sequence;
 
 /// Defines key maps and actions for key sequences
@@ -41,14 +46,14 @@ public:
 	bool read(std::string const & bind_file);
 
 	/// print all available keysyms
-	std::string const print() const;
+	docstring const print() const;
 
 	/**
 	 * Look up a key press in the keymap.
 	 * @param key the keysym
 	 * @param mod the modifiers
 	 * @param seq the current key sequence so far
-	 * @return the action / LFUN_PREFIX / LFUN_UNKNOWN_ACTION
+	 * @return the action / LFUN_COMMAND_PREFIX / LFUN_UNKNOWN_ACTION
 	 */
 	FuncRequest const &
 	lookup(LyXKeySymPtr key,
@@ -61,7 +66,7 @@ public:
 	Bindings findbindings(FuncRequest const & func) const;
 
 	/// Given an action, print the keybindings.
-	std::string const printbindings(FuncRequest const & func) const;
+	docstring const printbindings(FuncRequest const & func) const;
 
 	/**
 	 *  Given an action, find the first 1-key binding (if it exists).
@@ -106,7 +111,7 @@ private:
 		    unsigned int r = 0);
 
 	///  Returns a string of the given key
-	std::string const printKey(kb_key const & key) const;
+	docstring const printKey(kb_key const & key) const;
 
 	/**
 	 * Given an action, find all keybindings
@@ -126,4 +131,10 @@ private:
 	Table table;
 };
 
+/// Implementation is in lyx_main.C
+extern kb_keymap & theTopLevelKeymap();
+
+
+} // namespace lyx
+
 #endif // KBMAP_H