1 files changed, 15 insertions, 5 deletions
diff --git a/backends/common/keymapper.h b/backends/common/keymapper.h
index 1b3518c224..4f25ea37ff 100644
--- a/backends/common/keymapper.h
+++ b/backends/common/keymapper.h
@@ -1,23 +1,33 @@
 #ifndef COMMON_KEYMAPPER
 #define COMMON_KEYMAPPER
 
-#include "backends/common/keymap-manager.h"
+#include "backends/common/keymap.h"
+#include "common/list.h"
 
 namespace Common {
 
+class KeymapManager;
+
 class Keymapper {
 public:
 
-	Keymapper();
+	Keymapper(EventManager *eventMan);
 
-	void addHardwareKey(const HardwareKey& key);
+	void registerHardwareKeySet(HardwareKeySet *keys);
+	const HardwareKeySet *getHardwareKeySet();
 	void addGlobalKeyMap(const String& name, Keymap& keymap);
+	void addGameKeyMap(const String& gameid, const String& name, Keymap& keymap);
 
 private:
 
-	KeymapManager _manager;
+	typedef List<HardwareKey*>::iterator Iterator;
+
+	EventManager *_eventMan;
+	KeymapManager *_keymapMan;
+
+	Keymap *_currentMap;
 
-	List<HardwareKey*> _hardwareKeys;
+	const HardwareKeySet *_hardwareKeys;
 
 };