[Scummvm-cvs-logs] SF.net SVN: scummvm:[45796] scummvm/trunk/backends/platform
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Nov 10 00:58:13 CET 2009
Revision: 45796
http://scummvm.svn.sourceforge.net/scummvm/?rev=45796&view=rev
Author: fingolfin
Date: 2009-11-09 23:58:12 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
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 :/)
Revision Links:
--------------
http://scummvm.svn.sourceforge.net/scummvm/?rev=45791&view=rev
Modified Paths:
--------------
scummvm/trunk/backends/platform/gp2x/events.cpp
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-sdl.h
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.h
scummvm/trunk/backends/platform/samsungtv/events.cpp
scummvm/trunk/backends/platform/samsungtv/sdl.h
scummvm/trunk/backends/platform/sdl/events.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
Modified: scummvm/trunk/backends/platform/gp2x/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/events.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/gp2x/events.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -572,7 +572,7 @@
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;
}
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -410,7 +410,7 @@
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);
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -494,6 +494,6 @@
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;
}
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-sdl.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-sdl.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -61,7 +61,7 @@
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);
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -65,7 +65,7 @@
}
}
-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
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -50,7 +50,7 @@
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();
Modified: scummvm/trunk/backends/platform/samsungtv/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/events.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/samsungtv/events.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -351,7 +351,7 @@
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;
}
Modified: scummvm/trunk/backends/platform/samsungtv/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -426,7 +426,7 @@
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);
};
Modified: scummvm/trunk/backends/platform/sdl/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/events.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/sdl/events.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -315,7 +315,7 @@
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 @@
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)) {
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -486,7 +486,7 @@
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);
};
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-11-09 23:58:12 UTC (rev 45796)
@@ -318,7 +318,7 @@
* @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;
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2009-11-09 23:52:50 UTC (rev 45795)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2009-11-09 23:58:12 UTC (rev 45796)
@@ -103,7 +103,7 @@
// @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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list