diff options
author | Tarek Soliman | 2012-01-07 21:10:05 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-01-07 21:10:05 -0600 |
commit | 82e0900678ab755256e141e15dd58a99090388f1 (patch) | |
tree | 1f37acc0ae7d45365e3240c09a7cd5743c0c95f8 /backends/keymapper/keymapper.h | |
parent | 73160e54b43180b1fcc8f9de0a548e5817d0d1cd (diff) | |
download | scummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.tar.gz scummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.tar.bz2 scummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.zip |
KEYMAPPER: Rename inherit flag to transparent
Less confusing
Diffstat (limited to 'backends/keymapper/keymapper.h')
-rw-r--r-- | backends/keymapper/keymapper.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index d38109f210..90d9581d91 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -43,7 +43,7 @@ public: struct MapRecord { Keymap* keymap; - bool inherit; + bool transparent; bool global; }; @@ -121,12 +121,12 @@ public: /** * Push a new keymap to the top of the active stack, activating * it for use. - * @param name name of the keymap to push - * @param inherit if true keymapper will iterate down the - * stack if it cannot find a key in the new map - * @return true if succesful + * @param name name of the keymap to push + * @param transparent if true keymapper will iterate down the + * stack if it cannot find a key in the new map + * @return true if succesful */ - bool pushKeymap(const String& name, bool inherit = false); + bool pushKeymap(const String& name, bool transparent = false); /** * Pop the top keymap off the active stack. @@ -182,7 +182,7 @@ private: HardwareKeySet *_hardwareKeys; - void pushKeymap(Keymap *newMap, bool inherit, bool global); + void pushKeymap(Keymap *newMap, bool transparent, bool global); Action *getAction(const KeyState& key); void executeAction(const Action *act, bool keyDown); |