From 1f37da26263d137397f8787500d771dca0d460fe Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 Nov 2009 23:58:12 +0000
Subject: Revert rev 45791 and make the first param of OSystem_SDL::remapKey
 again non-const (as it may have to be modified for remapping. Of course.
 Silly me :/)

svn-id: r45796
---
 backends/platform/gp2x/events.cpp                | 2 +-
 backends/platform/gp2x/gp2x-common.h             | 2 +-
 backends/platform/gp2xwiz/gp2xwiz-events.cpp     | 2 +-
 backends/platform/gp2xwiz/gp2xwiz-sdl.h          | 2 +-
 backends/platform/linuxmoto/linuxmoto-events.cpp | 2 +-
 backends/platform/linuxmoto/linuxmoto-sdl.h      | 2 +-
 backends/platform/samsungtv/events.cpp           | 2 +-
 backends/platform/samsungtv/sdl.h                | 2 +-
 backends/platform/sdl/events.cpp                 | 4 ++--
 backends/platform/sdl/sdl.h                      | 2 +-
 backends/platform/symbian/src/SymbianOS.cpp      | 2 +-
 backends/platform/symbian/src/SymbianOS.h        | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/gp2x/events.cpp b/backends/platform/gp2x/events.cpp
index 060150cc78..e0117e9313 100644
--- a/backends/platform/gp2x/events.cpp
+++ b/backends/platform/gp2x/events.cpp
@@ -572,7 +572,7 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	return false;
 }
 
-bool OSystem_GP2X::remapKey(const SDL_Event &ev,Common::Event &event) {
+bool OSystem_GP2X::remapKey(SDL_Event &ev,Common::Event &event) {
 	return false;
 }
 
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index 12cf9fddb6..6878673024 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -410,7 +410,7 @@ protected:
 	void setupIcon();
 	void handleKbdMouse();
 
-	virtual bool remapKey(const SDL_Event &ev, Common::Event &event);
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
 	void handleScalerHotkeys(const SDL_KeyboardEvent &key);
 
diff --git a/backends/platform/gp2xwiz/gp2xwiz-events.cpp b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
index f5341a022e..2774efce1b 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-events.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
@@ -494,6 +494,6 @@ bool OSystem_GP2XWIZ::pollEvent(Common::Event &event) {
 	return false;
 }
 
-bool OSystem_GP2XWIZ::remapKey(const SDL_Event &ev,Common::Event &event) {
+bool OSystem_GP2XWIZ::remapKey(SDL_Event &ev,Common::Event &event) {
 	return false;
 }
diff --git a/backends/platform/gp2xwiz/gp2xwiz-sdl.h b/backends/platform/gp2xwiz/gp2xwiz-sdl.h
index ace11d0546..1f67624d5c 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-sdl.h
+++ b/backends/platform/gp2xwiz/gp2xwiz-sdl.h
@@ -61,7 +61,7 @@ public:
 	void moveStick();
 	void fillMouseEvent(Common::Event&, int, int);
 	void warpMouse(int, int);
-	bool remapKey(const SDL_Event&, Common::Event&);
+	bool remapKey(SDL_Event&, Common::Event&);
 
 	/* Platform Setup Stuff */
 	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
diff --git a/backends/platform/linuxmoto/linuxmoto-events.cpp b/backends/platform/linuxmoto/linuxmoto-events.cpp
index f11bd8a636..50daa12d5b 100644
--- a/backends/platform/linuxmoto/linuxmoto-events.cpp
+++ b/backends/platform/linuxmoto/linuxmoto-events.cpp
@@ -65,7 +65,7 @@ void OSystem_LINUXMOTO::fillMouseEvent(Common::Event &event, int x, int y) {
 	}
 }
 
-bool OSystem_LINUXMOTO::remapKey(const SDL_Event &ev, Common::Event &event) {
+bool OSystem_LINUXMOTO::remapKey(SDL_Event &ev, Common::Event &event) {
 	//  Motorol A1200/E6/A1600 remapkey by Lubomyr
 #ifdef MOTOEZX
 	// Quit on MOD+Camera Key on A1200
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.h b/backends/platform/linuxmoto/linuxmoto-sdl.h
index 9d4fe28d2e..57d1dc8972 100644
--- a/backends/platform/linuxmoto/linuxmoto-sdl.h
+++ b/backends/platform/linuxmoto/linuxmoto-sdl.h
@@ -50,7 +50,7 @@ public:
 	void hideOverlay();
 
 	/* Event Stuff */
-	virtual bool remapKey(const SDL_Event &ev, Common::Event &event);
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 	virtual void preprocessEvents(SDL_Event *event);
 	virtual void setupMixer();
 	virtual Common::HardwareKeySet *getHardwareKeySet();
diff --git a/backends/platform/samsungtv/events.cpp b/backends/platform/samsungtv/events.cpp
index 49d3f6d3ea..9d67272dce 100644
--- a/backends/platform/samsungtv/events.cpp
+++ b/backends/platform/samsungtv/events.cpp
@@ -351,7 +351,7 @@ bool OSystem_SDL_SamsungTV::pollEvent(Common::Event &event) {
 	return false;
 }
 
-bool OSystem_SDL_SamsungTV::remapKey(const SDL_Event &ev, Common::Event &event) {
+bool OSystem_SDL_SamsungTV::remapKey(SDL_Event &ev, Common::Event &event) {
 	return false;
 }
 
diff --git a/backends/platform/samsungtv/sdl.h b/backends/platform/samsungtv/sdl.h
index 9d55e5d171..3b81bba7f5 100644
--- a/backends/platform/samsungtv/sdl.h
+++ b/backends/platform/samsungtv/sdl.h
@@ -426,7 +426,7 @@ protected:
 	void setupIcon();
 	void handleKbdMouse();
 
-	virtual bool remapKey(const SDL_Event &ev, Common::Event &event);
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
 	void handleScalerHotkeys(const SDL_KeyboardEvent &key);
 };
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index a20e0b4387..505d79000a 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -315,7 +315,7 @@ bool OSystem_SDL::handleKeyDown(const SDL_Event &ev, Common::Event &event) {
 
 bool OSystem_SDL::handleKeyUp(const SDL_Event &ev, Common::Event &event) {
 	byte b = 0;
-	const bool event_complete = remapKey(ev,event);
+	const bool event_complete = remapKey(ev, event);
 
 	if (event_complete)
 		return true;
@@ -491,7 +491,7 @@ bool OSystem_SDL::handleJoyAxisMotion(const SDL_Event &ev, Common::Event &event)
 	return true;
 }
 
-bool OSystem_SDL::remapKey(const SDL_Event &ev, Common::Event &event) {
+bool OSystem_SDL::remapKey(SDL_Event &ev, Common::Event &event) {
 #ifdef LINUPY
 	// On Yopy map the End button to quit
 	if ((ev.key.keysym.sym == 293)) {
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index e17cd5c086..f9849e34d1 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -486,7 +486,7 @@ protected:
 	void setupIcon();
 	void handleKbdMouse();
 
-	virtual bool remapKey(const SDL_Event &ev, Common::Event &event);
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
 	void handleScalerHotkeys(const SDL_KeyboardEvent &key);
 };
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index cf4716c2db..f92813457a 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -318,7 +318,7 @@ void OSystem_SDL_Symbian::symbianMixCallback(void *sys, byte *samples, int len)
  * @param ScumVM event to modify if special result is requested
  * @return true if Common::Event has a valid return status
  */
-bool OSystem_SDL_Symbian::remapKey(const SDL_Event &ev, Common::Event &event) {
+bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (GUI::Actions::Instance()->mappingActive() || ev.key.keysym.sym <= SDLK_UNKNOWN)
 		return false;
 
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 43ed151302..b873b503be 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -103,7 +103,7 @@ protected:
 	// @param ScumVM event to modify if special result is requested
 	// @return true if Common::Event has a valid return status
 	//
-	bool remapKey(const SDL_Event &ev, Common::Event &event);
+	bool remapKey(SDL_Event &ev, Common::Event &event);
 
 	void setWindowCaption(const char *caption);
 
-- 
cgit v1.2.3