diff options
| author | Einar Johan Trøan Sømåen | 2012-03-13 04:57:25 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 12:12:36 +0200 |
| commit | afee4aeacccf66f52fefacbb0904049f0ce45227 (patch) | |
| tree | bc55768384380e3d9bcbc477f6ae10e30bc92149 /engines/wintermute/dctypes.h | |
| parent | f33e2d1824738ebe76d26a89498627ca13814e7f (diff) | |
| download | scummvm-rg350-afee4aeacccf66f52fefacbb0904049f0ce45227.tar.gz scummvm-rg350-afee4aeacccf66f52fefacbb0904049f0ce45227.tar.bz2 scummvm-rg350-afee4aeacccf66f52fefacbb0904049f0ce45227.zip | |
WINTERMUTE: One big and ugly commit that resolves most of the forbidden-symbols.
The StringUtils aren't complete or tested, and the SysClasses are a hack,
and there are a few "FORBIDDEN_SYMBOL_EXCEPTIONS".
Expect this commit to need a bunch of cleanup going forwards.
Diffstat (limited to 'engines/wintermute/dctypes.h')
| -rw-r--r-- | engines/wintermute/dctypes.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/engines/wintermute/dctypes.h b/engines/wintermute/dctypes.h index 0ee5a6bf54..bd5ec3b6e5 100644 --- a/engines/wintermute/dctypes.h +++ b/engines/wintermute/dctypes.h @@ -29,22 +29,29 @@ #ifndef WINTERMUTE_DCTYPES_H
#define WINTERMUTE_DCTYPES_H
-#include <string>
-#include <list>
-#include <vector>
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
-namespace WinterMute {
+#include "common/str.h"
+#include "common/list.h"
+#include "common/array.h"
+//#include <string>
+//#include <list>
+//#include <vector>
-typedef std::string AnsiString;
-typedef std::string Utf8String;
-typedef std::wstring WideString;
+namespace WinterMute {
+//typedef std::string AnsiString;
+//typedef std::string Utf8String;
+//typedef std::wstring WideString;
+typedef Common::String AnsiString;
+typedef Common::String Utf8String;
+typedef Common::String WideString; // NB: Not actually true I presume.
-typedef std::list<WideString> WideStringList;
-typedef std::list<AnsiString> AnsiStringList;
+typedef Common::List<WideString> WideStringList;
+typedef Common::List<AnsiString> AnsiStringList;
-typedef std::vector<WideString> WideStringArray;
-typedef std::vector<AnsiString> AnsiStringArray;
+typedef Common::Array<WideString> WideStringArray;
+typedef Common::Array<AnsiString> AnsiStringArray;
enum TGameState {
|