Merge remote branch 'upstream/master' into pegasus

1 files changed, 12 insertions, 1 deletions

diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index 32b52470bc..43bc262ade 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -29,25 +29,36 @@
 #include "backends/platform/maemo/maemo-common.h"
 
 namespace Maemo {
+class MaemoSdlEventObserver;
 
 class OSystem_SDL_Maemo : public OSystem_POSIX {
 public:
 	OSystem_SDL_Maemo();
+	~OSystem_SDL_Maemo();
 
 	virtual void initBackend();
 	virtual void quit();
 	virtual void fatalError();
 	virtual void setWindowCaption(const char *caption);
 	virtual void setupIcon();
+#ifdef ENABLE_KEYMAPPER
+	virtual Common::HardwareInputSet *getHardwareInputSet();
+	virtual Common::Keymap *getGlobalKeymap();
+	virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() { return _keymapperDefaultBindings; }
+#endif
 
 	Model getModel() { return _model; }
 
 private:
 	virtual void setXWindowName(const char *caption);
+	void initObserver();
 
 	const Model detectModel();
 	Model _model;
-
+	MaemoSdlEventObserver *_eventObserver;
+#ifdef ENABLE_KEYMAPPER
+	Common::KeymapperDefaultBindings *_keymapperDefaultBindings;
+#endif
 };
 
 } // namespace Maemo