diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index 78657d342f1..8514d4c07e6 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -56,7 +56,6 @@ #include "common/config-manager.h" #include "backends/audiocd/default/default-audiocd.h" -#include "backends/keymapper/keymapper.h" #include "backends/mutex/pthread/pthread-mutex.h" #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" @@ -332,10 +331,6 @@ void OSystem_Android::initBackend() { else ConfMan.setBool("swap_menu_and_back_buttons", false); - // must happen before creating TimerManager to avoid race in - // creating EventManager - setupKeymapper(); - // BUG: "transient" ConfMan settings get nuked by the options // screen. Passing the savepath in this way makes it stick // (via ConfMan.registerDefault) diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 1126b38f392..356a5514645 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -80,8 +80,6 @@ private: Common::String getSystemProperty(const char *name) const; - void setupKeymapper(); - protected: virtual Common::EventSource *getDefaultEventSource() { return this; } diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index f01bb809288..9025d446c96 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -52,31 +52,6 @@ static inline T scalef(T in, float numerator, float denominator) { static const int kQueuedInputEventDelay = 50; -void OSystem_Android::setupKeymapper() { -#ifdef ENABLE_KEYMAPPER - using namespace Common; - - Keymapper *mapper = getEventManager()->getKeymapper(); - - HardwareInputSet *inputSet = new HardwareInputSet(); - - keySet->addHardwareInput( - new HardwareInput("n", KeyState(KEYCODE_n), "n (vk)")); - - mapper->registerHardwareInputSet(inputSet); - - Keymap *globalMap = new Keymap(kGlobalKeymapName); - Action *act; - - act = new Action(globalMap, "VIRT", "Display keyboard"); - act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, KBD_CTRL)); - - mapper->addGlobalKeymap(globalMap); - - mapper->pushKeymap(kGlobalKeymapName); -#endif -} - void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) { Common::Event e;