diff options
author | Max Horn | 2010-10-31 17:10:45 +0000 |
---|---|---|
committer | Max Horn | 2010-10-31 17:10:45 +0000 |
commit | 086fe78af1b0d16d1902c8f9351e1dc7c103241b (patch) | |
tree | fe6248a0336b77457e2b87fe1476951cffa9ecd1 /backends/platform/wince/CEActionsPocket.h | |
parent | ae829727da27a889ce8590bdc08d20c52833af20 (diff) | |
download | scummvm-rg350-086fe78af1b0d16d1902c8f9351e1dc7c103241b.tar.gz scummvm-rg350-086fe78af1b0d16d1902c8f9351e1dc7c103241b.tar.bz2 scummvm-rg350-086fe78af1b0d16d1902c8f9351e1dc7c103241b.zip |
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
Diffstat (limited to 'backends/platform/wince/CEActionsPocket.h')
-rw-r--r-- | backends/platform/wince/CEActionsPocket.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h index 0fe29a9e86..0a15e25648 100644 --- a/backends/platform/wince/CEActionsPocket.h +++ b/backends/platform/wince/CEActionsPocket.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,11 +58,13 @@ enum pocketActionType { POCKET_ACTION_LAST }; +class OSystem_WINCE3; + class CEActionsPocket : 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(); @@ -70,7 +72,7 @@ class CEActionsPocket : public GUI::Actions { void initInstanceGame(); // Action domain - String domain(); + Common::String domain(); int version(); // Utility |