diff options
author | Johannes Schickel | 2009-05-24 15:17:42 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-05-24 15:17:42 +0000 |
commit | b3c6751b9b7fc1401fd5e87a034cdaec92b67b20 (patch) | |
tree | aa00dba58fb88ea2e095b886963370c7290c692b /backends/keymapper/keymap.h | |
parent | 7c1eb057146af11793c627327f3fefe309d27fbb (diff) | |
download | scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.gz scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.bz2 scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.zip |
Strip trailing whitespaces in the whole code base.
svn-id: r40867
Diffstat (limited to 'backends/keymapper/keymap.h')
-rw-r--r-- | backends/keymapper/keymap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h index 35ad732bdc..615fd9097d 100644 --- a/backends/keymapper/keymap.h +++ b/backends/keymapper/keymap.h @@ -48,7 +48,7 @@ class HardwareKeySet; template<> struct Hash<KeyState> : public UnaryFunction<KeyState, uint> { - uint operator()(const KeyState &val) const { + uint operator()(const KeyState &val) const { return (uint)val.keycode | ((uint)val.flags << 24); } }; @@ -78,7 +78,7 @@ public: * @return a pointer to the Action or 0 if no */ Action *getMappedAction(const KeyState& ks) const; - + void setConfigDomain(ConfigManager::Domain *dom); /** @@ -94,7 +94,7 @@ public: */ void saveMappings(); - + void automaticMapping(HardwareKeySet *hwKeys); /** @@ -110,7 +110,7 @@ private: friend struct Action; /** - * Adds a new Action to this Map, + * Adds a new Action to this Map, * adding it at the back of the internal array * @param action the Action to add */ @@ -141,7 +141,7 @@ private: String _name; Keymap *_parent; List<Action*> _actions; - HashMap<KeyState, Action*> _keymap; + HashMap<KeyState, Action*> _keymap; ConfigManager::Domain *_configDomain; }; |