diff options
| author | Jody Northup | 2009-08-18 08:00:24 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-08-18 08:00:24 +0000 |
| commit | dfaa5acbee5766e59b35697ea1b03122aa4ea2aa (patch) | |
| tree | fb06e849c8fad9a4a81f68a12e5d2d2397ed0098 | |
| parent | 445b01676ee13fde91042094585376c2674fe606 (diff) | |
| download | scummvm-rg350-dfaa5acbee5766e59b35697ea1b03122aa4ea2aa.tar.gz scummvm-rg350-dfaa5acbee5766e59b35697ea1b03122aa4ea2aa.tar.bz2 scummvm-rg350-dfaa5acbee5766e59b35697ea1b03122aa4ea2aa.zip | |
Starting to simplify the Action structure, and rework it to facilitate making the automatic mapper smarter, at least when there is a keyboard present. Fixed a minor whitespace issue in a comment.
svn-id: r43502
| -rw-r--r-- | backends/keymapper/action.cpp | 4 | ||||
| -rw-r--r-- | backends/keymapper/action.h | 4 | ||||
| -rw-r--r-- | backends/keymapper/keymap.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp index 1f4efbf457..4633f20df3 100644 --- a/backends/keymapper/action.cpp +++ b/backends/keymapper/action.cpp @@ -32,9 +32,9 @@ namespace Common { Action::Action(Keymap *boss, const char *i, String des, ActionType typ, - KeyType prefKey, int pri, int flg) + KeyType prefKey, int pri) : _boss(boss), description(des), type(typ), preferredKey(prefKey), - priority(pri), flags(flg), _hwKey(0) { + priority(pri), _hwKey(0) { assert(i); assert(_boss); diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h index c49518b605..c78a526414 100644 --- a/backends/keymapper/action.h +++ b/backends/keymapper/action.h @@ -54,8 +54,6 @@ struct Action { ActionType type; KeyType preferredKey; int priority; - int group; - int flags; private: /** Hardware key that is mapped to this Action */ @@ -66,7 +64,7 @@ public: Action(Keymap *boss, const char *id, String des = "", ActionType typ = kGenericActionType, KeyType prefKey = kGenericKeyType, - int pri = 0, int flg = 0 ); + int pri = 0); void addEvent(const Event &evt) { events.push_back(evt); diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp index 9d8b6046cd..f082640f2c 100644 --- a/backends/keymapper/keymap.cpp +++ b/backends/keymapper/keymap.cpp @@ -240,7 +240,7 @@ void Keymap::automaticMapping(HardwareKeySet *hwKeys) { // First mapping pass: // - Match if a key's preferred action type is the same as the action's - // type, or vice versa. + // type, or vice versa. // - Priority is given to: // - keys that match action types over key types. // - keys that have not been used by parent maps. |