diff options
Diffstat (limited to 'backends/keymapper')
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 3 | ||||
| -rw-r--r-- | backends/keymapper/keymapper.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 1ac0af6025..d9933ab500 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -54,7 +54,8 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) { Keymapper::Keymapper(EventManager *evtMgr) : _eventMan(evtMgr), _enabled(true), _hardwareKeys(0) { - _globalDomain.setConfigDomain(ConfMan.getDomain(ConfigManager::kApplicationDomain)); + ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kApplicationDomain); + _globalDomain.setConfigDomain(confDom); } Keymapper::~Keymapper() { diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 8a7ff5f3fc..ecdf0b9737 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -124,7 +124,7 @@ public: * it for use. * @param name name of the keymap to push * @param inherit if true keymapper will iterate down the - * stack it cannot find a key in the new map + * stack if it cannot find a key in the new map * @return true if succesful */ bool pushKeymap(const String& name, bool inherit = false); @@ -184,8 +184,6 @@ private: Action *getAction(const KeyState& key); void executeAction(const Action *act, bool keyDown); - typedef List<HardwareKey*>::iterator Iterator; - EventManager *_eventMan; bool _enabled; |