aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarek Soliman2012-02-27 12:35:48 -0600
committerTarek Soliman2012-02-27 13:04:59 -0600
commit533f80282befe2e3c345ed1f6fc372b669811b15 (patch)
tree70a15d948de9f89b46f9c8b7f8fe43160d31cbef
parent6afac4e01eba5c297e99597dd2cb17c2e4732a7e (diff)
downloadscummvm-rg350-533f80282befe2e3c345ed1f6fc372b669811b15.tar.gz
scummvm-rg350-533f80282befe2e3c345ed1f6fc372b669811b15.tar.bz2
scummvm-rg350-533f80282befe2e3c345ed1f6fc372b669811b15.zip
KEYMAPPER: Rename EVENT_CUSTOM_BACKEND to EVENT_CUSTOM_BACKEND_ACTION
-rw-r--r--backends/events/maemosdl/maemosdl-events.cpp2
-rw-r--r--backends/platform/maemo/maemo.cpp2
-rw-r--r--common/events.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 0046d297eb..dcdf0384e3 100644
--- a/backends/events/maemosdl/maemosdl-events.cpp
+++ b/backends/events/maemosdl/maemosdl-events.cpp
@@ -201,7 +201,7 @@ MaemoSdlEventObserver::MaemoSdlEventObserver(MaemoSdlEventSource *eventSource) {
bool MaemoSdlEventObserver::notifyEvent(const Common::Event &event) {
#ifdef ENABLE_KEYMAPPER
- if (event.type != Common::EVENT_CUSTOM_BACKEND)
+ if (event.type != Common::EVENT_CUSTOM_BACKEND_ACTION)
return false;
if (event.customType == kEventClickMode) {
assert(_eventSource);
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 53e88d2286..5e8b6e16a7 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -194,7 +194,7 @@ Common::Keymap *OSystem_SDL_Maemo::getGlobalKeymap() {
act = new Action(globalMap, "CLKM", _("Click Mode"));
Event evt = Event();
- evt.type = EVENT_CUSTOM_BACKEND;
+ evt.type = EVENT_CUSTOM_BACKEND_ACTION;
evt.customType = Maemo::kEventClickMode;
act->addEvent(evt);
diff --git a/common/events.h b/common/events.h
index 5f6a7798dd..4efdd67b91 100644
--- a/common/events.h
+++ b/common/events.h
@@ -78,7 +78,7 @@ enum EventType {
,
// IMPORTANT NOTE: This is part of the WIP Keymapper. If you plan to use
// this, please talk to tsoliman and/or LordHoto.
- EVENT_CUSTOM_BACKEND = 18,
+ EVENT_CUSTOM_BACKEND_ACTION = 18,
EVENT_KEYMAPPER_REMAP = 19
#endif
#ifdef ENABLE_VKEYBD