aboutsummaryrefslogtreecommitdiff
path: root/backends/keymapper/keymapper.h
diff options
context:
space:
mode:
Diffstat (limited to 'backends/keymapper/keymapper.h')
-rw-r--r--backends/keymapper/keymapper.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index 3c6cd5bc36..8a7ff5f3fc 100644
--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@@ -84,9 +84,12 @@ public:
void registerHardwareKeySet(HardwareKeySet *keys);
/**
- * Get the HardwareKeySet that is registered with the Keymapper
+ * Get a list of all registered HardwareKeys
*/
- HardwareKeySet *getHardwareKeySet() { return _hardwareKeys; }
+ const List<const HardwareKey*> &getHardwareKeys() const {
+ assert(_hardwareKeys);
+ return _hardwareKeys->getHardwareKeys();
+ }
/**
* Add a keymap to the global domain.
@@ -161,7 +164,7 @@ public:
/**
* Return a HardwareKey pointer for the given key state
*/
- const HardwareKey *getHardwareKey(const KeyState& key);
+ const HardwareKey *findHardwareKey(const KeyState& key);
Domain& getGlobalDomain() { return _globalDomain; }
Domain& getGameDomain() { return _gameDomain; }
@@ -169,8 +172,7 @@ public:
private:
- void initKeymap(ConfigManager::Domain *domain, Keymap *keymap);
- void refreshGameDomain();
+ void initKeymap(Domain &domain, Keymap *keymap);
Domain _globalDomain;
Domain _gameDomain;