KEYMAPPER: Constantify global keymap name

This commit is contained in:
Tarek Soliman 2012-01-07 21:20:29 -06:00
parent 82e0900678
commit d143872be6
3 changed files with 5 additions and 4 deletions

View File

@ -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:

View File

@ -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
}

View File

@ -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
}