X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.h;h=cd28782356ac98336fb791def7b84c5d5824d789;hb=f58638c704b0b4ac66e5f88431901977cc7801be;hp=1a37a1fc99772fae1ded88eaaf5c86dee5950e86;hpb=375d1526bb07bfcd21dd5bb11f39a60a00119d57;p=lyx.git diff --git a/src/KeyMap.h b/src/KeyMap.h index 1a37a1fc99..cd28782356 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -19,7 +19,7 @@ #include "support/strfwd.h" -#include +#include "support/shared_ptr.h" #include @@ -163,13 +163,21 @@ private: /// Modifier masks ModifierPair mod; /// Keymap for prefix keys - boost::shared_ptr prefixes; + shared_ptr prefixes; /// Action for !prefix keys FuncRequest func; }; + enum ReturnValues { + ReadOK, + ReadError, + FileError, + FormatMismatch + }; /// bool read(support::FileName const & bind_file, KeyMap * unbind_map = 0); + /// + ReturnValues readWithoutConv(support::FileName const & bind_file, KeyMap * unbind_map = 0); /** * Given an action, find all keybindings