diff options
author | Tarek Soliman | 2012-02-24 13:23:55 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-02-27 13:00:56 -0600 |
commit | 6afac4e01eba5c297e99597dd2cb17c2e4732a7e (patch) | |
tree | da3a7473c70f529a7cc399975349607d412eb713 /backends/keymapper/keymapper.h | |
parent | b0f961924a856b71ebffdb834db122145c4c10e5 (diff) | |
download | scummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.tar.gz scummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.tar.bz2 scummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.zip |
KEYMAPPER: Rename HardwareKey to HardwareInput
Diffstat (limited to 'backends/keymapper/keymapper.h')
-rw-r--r-- | backends/keymapper/keymapper.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 31bfcbc080..daa746f379 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -31,7 +31,7 @@ #include "common/list.h" #include "common/hashmap.h" #include "common/stack.h" -#include "backends/keymapper/hardware-key.h" +#include "backends/keymapper/hardware-input.h" #include "backends/keymapper/keymap.h" namespace Common { @@ -81,17 +81,17 @@ public: virtual List<Event> mapEvent(const Event &ev, EventSource *source); /** - * Registers a HardwareKeySet with the Keymapper + * Registers a HardwareInputSet with the Keymapper * @note should only be called once (during backend initialisation) */ - void registerHardwareKeySet(HardwareKeySet *keys); + void registerHardwareInputSet(HardwareInputSet *inputs); /** - * Get a list of all registered HardwareKeys + * Get a list of all registered HardwareInputs */ - const List<const HardwareKey *> &getHardwareKeys() const { - assert(_hardwareKeys); - return _hardwareKeys->getHardwareKeys(); + const List<const HardwareInput *> &getHardwareInputs() const { + assert(_hardwareInputs); + return _hardwareInputs->getHardwareInputs(); } /** @@ -168,9 +168,9 @@ public: void setEnabled(bool enabled) { _enabled = enabled; } /** - * Return a HardwareKey pointer for the given key state + * Return a HardwareInput pointer for the given key state */ - const HardwareKey *findHardwareKey(const KeyState& key); + const HardwareInput *findHardwareInput(const KeyState& key); Domain& getGlobalDomain() { return _globalDomain; } Domain& getGameDomain() { return _gameDomain; } @@ -183,7 +183,7 @@ private: Domain _globalDomain; Domain _gameDomain; - HardwareKeySet *_hardwareKeys; + HardwareInputSet *_hardwareInputs; void pushKeymap(Keymap *newMap, bool transparent, bool global); |