X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.h;h=f6a82c082c0245b3aa2eb1a14932a55fe044519c;hb=cf26d53e037cf59b5816cdb2f5c7d835b83d480a;hp=e2d0f3aac07afed49d765f39297d487a960fb8ea;hpb=c9b9748cee687e709e9e48dd2c78e054d8ea29a3;p=lyx.git

diff --git a/src/KeyMap.h b/src/KeyMap.h
index e2d0f3aac0..f6a82c082c 100644
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -19,8 +19,7 @@
 
 #include "support/strfwd.h"
 
-#include "support/shared_ptr.h"
-
+#include <memory>
 #include <vector>
 
 
@@ -163,13 +162,21 @@ private:
 		/// Modifier masks
 		ModifierPair mod;
 		/// Keymap for prefix keys
-		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