From 086fe78af1b0d16d1902c8f9351e1dc7c103241b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 31 Oct 2010 17:10:45 +0000
Subject: 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
---
 backends/platform/wince/CEActionsSmartphone.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'backends/platform/wince/CEActionsSmartphone.h')

diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h
index 36797cd2c8..d7a6f535b6 100644
--- a/backends/platform/wince/CEActionsSmartphone.h
+++ b/backends/platform/wince/CEActionsSmartphone.h
@@ -28,7 +28,7 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "wince-sdl.h"
+#include "common/str.h"
 #include "gui/Key.h"
 #include "gui/Actions.h"
 
@@ -58,14 +58,14 @@ class CEActionsSmartphone : public GUI::Actions {
 	public:
 		// Actions
 		bool perform(GUI::ActionType action, bool pushed = true);
-		String actionName(GUI::ActionType action);
+		Common::String actionName(GUI::ActionType action);
 		int size();
 		static void init();
 		void initInstanceMain(OSystem *mainSystem);
 		void initInstanceGame();
 
 		// Action domain
-		String domain();
+		Common::String domain();
 		int version();
 
 		~CEActionsSmartphone();
-- 
cgit v1.2.3