Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / KeyMap.h

diff --git a/src/KeyMap.h b/src/KeyMap.h
index 1a37a1fc99772fae1ded88eaaf5c86dee5950e86..f6a82c082c0245b3aa2eb1a14932a55fe044519c 100644 (file)
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -19,8 +19,7 @@
 
 #include "support/strfwd.h"
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 #include <vector>
 
 
@@ -163,13 +162,21 @@ private:
                /// Modifier masks
                ModifierPair mod;
                /// Keymap for prefix keys
-               boost::shared_ptr<KeyMap> prefixes;
+               std::shared_ptr<KeyMap> 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