diff options
author | Tarek Soliman | 2012-01-07 21:20:29 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-01-07 21:20:29 -0600 |
commit | d143872be605b881eaec63b0168c9d4d551787ee (patch) | |
tree | a61132f9018890ed6540cdecdb5c54de4a395647 | |
parent | 82e0900678ab755256e141e15dd58a99090388f1 (diff) | |
download | scummvm-rg350-d143872be605b881eaec63b0168c9d4d551787ee.tar.gz scummvm-rg350-d143872be605b881eaec63b0168c9d4d551787ee.tar.bz2 scummvm-rg350-d143872be605b881eaec63b0168c9d4d551787ee.zip |
KEYMAPPER: Constantify global keymap name
-rw-r--r-- | backends/keymapper/keymapper.h | 1 | ||||
-rw-r--r-- | backends/platform/android/events.cpp | 4 | ||||
-rw-r--r-- | base/main.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 90d9581d91..cd060a413c 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -37,6 +37,7 @@ namespace Common { const char *const kGuiKeymapName = "gui"; +const char *const kGlobalKeymapName = "global"; class Keymapper : public Common::EventMapper, private Common::ArtificialEventSource { public: diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index 2a16e69411..e73e689e3b 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -231,7 +231,7 @@ void OSystem_Android::setupKeymapper() { mapper->registerHardwareKeySet(keySet); - Keymap *globalMap = new Keymap("global"); + Keymap *globalMap = new Keymap(kGlobalKeymapName); Action *act; act = new Action(globalMap, "VIRT", "Display keyboard", @@ -240,7 +240,7 @@ void OSystem_Android::setupKeymapper() { mapper->addGlobalKeymap(globalMap); - mapper->pushKeymap("global"); + mapper->pushKeymap(kGlobalKeymapName); #endif } diff --git a/base/main.cpp b/base/main.cpp index b4cfd45689..b39165ed6a 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -264,7 +264,7 @@ static void setupKeymapper(OSystem &system) { using namespace Common; Keymapper *mapper = system.getEventManager()->getKeymapper(); - Keymap *globalMap = new Keymap("global"); + Keymap *globalMap = new Keymap(kGlobalKeymapName); Action *act; HardwareKeySet *keySet; @@ -294,7 +294,7 @@ static void setupKeymapper(OSystem &system) { mapper->addGlobalKeymap(globalMap); - mapper->pushKeymap("global", true); + mapper->pushKeymap(kGlobalKeymapName, true); #endif } |