X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.h;h=acb0c22110ccdd0093a52aadd9e4a0802dfee1a0;hb=51ac7d895cc7a9c4ad91131d0b4734395366d04b;hp=b9f8b28641b4a4c184a140d4ca935f2b8bfbf849;hpb=65ce182131727603e99e1659a86a3e90b41dcab4;p=lyx.git diff --git a/src/KeyMap.h b/src/KeyMap.h index b9f8b28641..acb0c22110 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -22,7 +22,6 @@ #include #include -#include namespace lyx { @@ -91,13 +90,13 @@ public: lookup(KeySymbol const & key, KeyModifier mod, KeySequence * seq) const; /// - typedef std::deque Bindings; + typedef std::vector Bindings; /// Given an action, find all keybindings. - Bindings findbindings(FuncRequest const & func) const; + Bindings findBindings(FuncRequest const & func) const; /// Given an action, print the keybindings. - docstring const printbindings(FuncRequest const & func) const; + docstring printBindings(FuncRequest const & func) const; struct Binding { Binding(FuncRequest const & r, KeySequence const & s, int t) @@ -139,13 +138,10 @@ private: struct Key { /// Keysym KeySymbol code; - /// Modifier masks ModifierPair mod; - /// Keymap for prefix keys boost::shared_ptr table; - /// Action for !prefix keys FuncRequest func; }; @@ -155,7 +151,7 @@ private: * @param func the action * @param prefix a sequence to prepend the results */ - Bindings findbindings(FuncRequest const & func, + Bindings findBindings(FuncRequest const & func, KeySequence const & prefix) const; void listBindings(BindingList & list, KeySequence const & prefix,