diff options
| author | Max Horn | 2010-03-18 15:09:24 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-18 15:09:24 +0000 |
| commit | c934642bdb7e6747a20054d7cc7b079e69bc22c2 (patch) | |
| tree | 190d12bad5ed1cbabbd498d310f261c3a1c25bc9 /engines/sci | |
| parent | 30c84d2cff41924e6229d0cacd3d36ce1c2bf6ac (diff) | |
| download | scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.tar.gz scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.tar.bz2 scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.zip | |
COMMON: Move typedef StringList from str.h to new header str-array.h
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.
svn-id: r48282
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/kernel.h | 7 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 542612113d..a8915f4860 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -29,6 +29,7 @@ #include "common/scummsys.h" #include "common/debug.h" #include "common/rect.h" +#include "common/str-array.h" #include "sci/sci.h" // for USE_OLD_MUSIC_FUNCTIONS #include "sci/engine/vm_types.h" // for reg_t @@ -175,7 +176,7 @@ private: * Check for any hardcoded selector table we might have that can be used * if a game is missing the selector names. */ - Common::StringList checkStaticSelectorNames(); + Common::StringArray checkStaticSelectorNames(); /** * Maps special selectors @@ -191,8 +192,8 @@ private: uint32 features; // Kernel-related lists - Common::StringList _selectorNames; - Common::StringList _kernelNames; + Common::StringArray _selectorNames; + Common::StringArray _kernelNames; }; /******************** Text functionality ********************/ diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index f638f78d03..4f36ae00c4 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -29,6 +29,7 @@ #include "common/scummsys.h" #include "common/array.h" #include "common/serializer.h" +#include "common/str-array.h" namespace Common { class SeekableReadStream; @@ -54,8 +55,8 @@ class SoundCommandParser; class DirSeeker { protected: reg_t _outbuffer; - Common::StringList _savefiles; - Common::StringList::const_iterator _iter; + Common::StringArray _savefiles; + Common::StringArray::const_iterator _iter; public: DirSeeker() { |