KeymapManager - implemented loading/saving of keymaps

- Refactoring of code to map a key to a UserAction - now we call a method on UserAction to do it (and it then tells the Keymap class)
- General cleanup of code

svn-id: r33262

1 files changed, 7 insertions, 1 deletions

diff --git a/backends/common/keymap-manager.h b/backends/common/keymap-manager.h
index c056fbe024..b74133d781 100644
--- a/backends/common/keymap-manager.h
+++ b/backends/common/keymap-manager.h
@@ -1,6 +1,7 @@
 #ifndef COMMON_KEYMAP_MANAGER
 #define COMMON_KEYMAP_MANAGER
 
+#include "backends/common/hardware-key.h"
 #include "backends/common/keymap.h"
 #include "common/config-manager.h"
 #include "common/hash-str.h"
@@ -32,6 +33,8 @@ public:
 		KeymapMap _keymaps;
 	};
 
+	void registerHardwareKeySet(HardwareKeySet *keys);
+
 	void registerDefaultGlobalKeymap(Keymap *map);
 	void registerGlobalKeymap(const String& name, Keymap *map);
 
@@ -46,11 +49,14 @@ private:
 
 	void initKeymap(ConfigManager::Domain *domain, const String& name, Keymap *keymap);
 	bool loadKeymap(ConfigManager::Domain *domain, const String& name, Keymap *keymap);
-	void saveKeymap(ConfigManager::Domain *domain, const String& name, Keymap *keymap);
+	void saveKeymap(ConfigManager::Domain *domain, const String& name, const Keymap *keymap);
 	void automaticMap(Keymap *map);
+	bool isMapComplete(const Keymap *map);
 
 	Domain _globalDomain;
 	Domain _gameDomain;
+
+	HardwareKeySet *_hardwareKeys;
 };
 
 } // end of namespace Common