X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.h;h=9c1ddecd2259d3858e4dcb7cef6050e96a7b6b8b;hb=98c966c64594611e469313314abd1e59524adb4a;hp=27b62fd1eb9dca98bf9ed8a9bb1e38a76c429ce5;hpb=39eec46bd31753afaec103fcc45f9d6ba75bdb3e;p=lyx.git

diff --git a/src/kbmap.h b/src/kbmap.h
index 27b62fd1eb..9c1ddecd22 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -1,10 +1,12 @@
 // -*- C++ -*-
-/* ======================================================================= *\
-   File   : kbmap.h, kbmap.h,v 1.3 1996/12/10 04:35:57 larsbj Exp
-   Author : chb, 30.Oct.1995
-   Docu   : see kbmap.C
-   Purpose: class definitions for XKeyEvent keymap handling
-   \* ==================================================================== */
+/**
+ * \file kbmap.h
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Lars Gullik Bjønnes <larsbj@lyx.org>
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
 
 #ifndef KBMAP_H
 #define KBMAP_H
@@ -16,8 +18,6 @@
 #include <list>
 #include <boost/smart_ptr.hpp>
 
-#include "commandtags.h"
-
 #include "LString.h"
 
 class kb_sequence;
@@ -30,11 +30,11 @@ public:
 	 * @return 0 on success, or position in string seq where error
 	 * occurs.
 	 */
-	string::size_type bind(string const & seq, kb_action action);
+	string::size_type bind(string const & seq, int action);
 
 	/// print all available keysyms
 	string const print() const;
-	
+
 	/**
 	 * Look up a key press in the keymap.
 	 * @param key the keysym
@@ -42,11 +42,11 @@ public:
 	 * @param seq the current key sequence so far
 	 * @return the action / LFUN_PREFIX / LFUN_UNKNOWN_ACTION
 	 */
-	kb_action lookup(unsigned int key,
-		unsigned int mod, kb_sequence * seq) const;
+	int lookup(unsigned int key,
+		   unsigned int mod, kb_sequence * seq) const;
 
 	/// Given an action, find all keybindings.
-	string const findbinding(kb_action action,
+	string const findbinding(int action,
 				 string const & prefix = string()) const;
 
 	/**
@@ -64,15 +64,15 @@ private:
 	struct kb_key {
 		/// Keysym
 		unsigned int code;
-		
+
 		/// Modifier masks
 		unsigned int mod;
-		
+
 		/// Keymap for prefix keys
 		boost::shared_ptr<kb_keymap> table;
-		
+
 		/// Action for !prefix keys
-		kb_action action;
+		int action;
 	};
 
 
@@ -80,8 +80,8 @@ private:
 	 * Define an action for a key sequence.
 	 * @param r internal recursion level
 	 */
-	void defkey(kb_sequence * seq, kb_action action, unsigned int r = 0);
-	
+	void defkey(kb_sequence * seq, int action, unsigned int r = 0);
+
 	///  Returns a string of the given key
 	string const printKey(kb_key const & key) const;
 
@@ -95,4 +95,4 @@ private:
 	Table table;
 };
 
-#endif
+#endif // KBMAP_H