fix typo that put too many include paths for most people

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index 7a147621d801f04f33d16b91f9968ea751cb8a10..7004b3ec73298a54fc2ed3af5ab75f3f5ecfe960 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -2,7 +2,7 @@
  * ======================================================
  *
  *           LyX, The Document Processor
- *     
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -17,6 +17,7 @@
 #endif
 
 #include "kbmap.h"
+#include "commandtags.h"
 #include "kbsequence.h"
 #include "debug.h"
 
@@ -33,7 +34,7 @@ string const kb_keymap::printKeysym(unsigned int key, unsigned int mod)
        mod &= ModsMask;
 
        char const * const s = XKeysymToString(key);
-       
+
        if (mod & ShiftMask) buf += "S-";
        if (mod & ControlMask) buf += "C-";
        if (mod & Mod1Mask) buf += "M-";
@@ -71,14 +72,14 @@ string const kb_keymap::printKey(kb_key const & key) const
 }
 
 
-string::size_type kb_keymap::bind(string const & seq, kb_action action)
+string::size_type kb_keymap::bind(string const & seq, int action)
 {
        if (lyxerr.debugging(Debug::KBMAP)) {
                lyxerr << "BIND: Sequence `"
                       << seq << "' Action `"
                       << action << "'" << endl;
        }
-       
+
        kb_sequence k(0, 0);
 
        string::size_type const res = k.parse(seq);
@@ -94,7 +95,7 @@ string::size_type kb_keymap::bind(string const & seq, kb_action action)
 }
 
 
-kb_action kb_keymap::lookup(unsigned int key,
+int kb_keymap::lookup(unsigned int key,
                      unsigned int mod, kb_sequence * seq) const
 {
        if (table.empty()) {
@@ -144,7 +145,7 @@ string const kb_keymap::print() const
 }
 
 
-void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r)
+void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 {
        unsigned int const code = seq->sequence[r];
        if (code == NoSymbol) return;
@@ -177,7 +178,7 @@ void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r)
                        }
                }
        }
-       
+
        Table::iterator newone = table.insert(table.end(), kb_key());
        newone->code = code;
        newone->mod = modmsk;
@@ -193,7 +194,7 @@ void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r)
 }
 
 
-string const kb_keymap::findbinding(kb_action act, string const & prefix) const
+string const kb_keymap::findbinding(int act, string const & prefix) const
 {
        string res;
        if (table.empty()) return res;