WINCE: Enable use of forbidden symbols, cleanup

I tried to untangle the header interdependencies a bit, but this
is still quite a mess.
This commit also fixes some warnings.

svn-id: r53978

1 files changed, 9 insertions, 5 deletions

diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp
index 64abd0be3e..2005c86847 100644
--- a/backends/platform/wince/CEActionsPocket.cpp
+++ b/backends/platform/wince/CEActionsPocket.cpp
@@ -23,21 +23,25 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "backends/platform/wince/wince-sdl.h"
 
 #include "CEActionsPocket.h"
 #include "EventsBuffer.h"
 #include "gui/message.h"
-#include "scumm/scumm.h"
 #include "common/config-manager.h"
 #include "gui/KeysDialog.h"
 
 #include "common/translation.h"
 
+
 #ifdef _WIN32_WCE
 #define		KEY_ALL_SKIP	3457
 #endif
 
-const String pocketActionNames[] = {
+const Common::String pocketActionNames[] = {
 	_s("Pause"),
 	_s("Save"),
 	_s("Quit"),
@@ -64,7 +68,7 @@ void CEActionsPocket::init() {
 }
 
 
-String CEActionsPocket::actionName(GUI::ActionType action) {
+Common::String CEActionsPocket::actionName(GUI::ActionType action) {
 	return _(pocketActionNames[action]);
 }
 
@@ -72,7 +76,7 @@ int CEActionsPocket::size() {
 	return POCKET_ACTION_LAST;
 }
 
-String CEActionsPocket::domain() {
+Common::String CEActionsPocket::domain() {
 	return ConfMan.kApplicationDomain;
 }
 
@@ -114,7 +118,7 @@ void CEActionsPocket::initInstanceMain(OSystem *mainSystem) {
 }
 
 void CEActionsPocket::initInstanceGame() {
-	String gameid(ConfMan.get("gameid"));
+	Common::String gameid(ConfMan.get("gameid"));
 	bool is_simon = (strncmp(gameid.c_str(), "simon", 5) == 0);
 	bool is_sword1 = (gameid == "sword1");
 	bool is_sword2 = (strcmp(gameid.c_str(), "sword2") == 0);