[Scummvm-cvs-logs] scummvm master -> 533f80282befe2e3c345ed1f6fc372b669811b15

[tsoliman]

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:
533f80282b KEYMAPPER: Rename EVENT_CUSTOM_BACKEND to EVENT_CUSTOM_BACKEND_ACTION


Commit: 533f80282befe2e3c345ed1f6fc372b669811b15
    https://github.com/scummvm/scummvm/commit/533f80282befe2e3c345ed1f6fc372b669811b15
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-27T11:04:59-08:00

Commit Message:
KEYMAPPER: Rename EVENT_CUSTOM_BACKEND to EVENT_CUSTOM_BACKEND_ACTION

Changed paths:
    backends/events/maemosdl/maemosdl-events.cpp
    backends/platform/maemo/maemo.cpp
    common/events.h



diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 0046d29..dcdf038 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 53e88d2..5e8b6e1 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 5f6a779..4efdd67 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