[Scummvm-cvs-logs] scummvm master -> d143872be605b881eaec63b0168c9d4d551787ee

tsoliman tarek at bashasoliman.com
Sun Jan 8 04:22:51 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d143872be6 KEYMAPPER: Constantify global keymap name


Commit: d143872be605b881eaec63b0168c9d4d551787ee
    https://github.com/scummvm/scummvm/commit/d143872be605b881eaec63b0168c9d4d551787ee
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-01-07T19:20:29-08:00

Commit Message:
KEYMAPPER: Constantify global keymap name

Changed paths:
    backends/keymapper/keymapper.h
    backends/platform/android/events.cpp
    base/main.cpp



diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index 90d9581..cd060a4 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 2a16e69..e73e689 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 b4cfd45..b39165e 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
 
 }






More information about the Scummvm-git-logs mailing list