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 /graphics/font.cpp | |
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 'graphics/font.cpp')
-rw-r--r-- | graphics/font.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/font.cpp b/graphics/font.cpp index c6053e9eb3..629f2f4b82 100644 --- a/graphics/font.cpp +++ b/graphics/font.cpp @@ -864,10 +864,10 @@ void Font::drawString(Surface *dst, const Common::String &sOld, int x, int y, in struct WordWrapper { - Common::StringList &lines; + Common::Array<Common::String> &lines; int actualMaxLineWidth; - WordWrapper(Common::StringList &l) : lines(l), actualMaxLineWidth(0) { + WordWrapper(Common::Array<Common::String> &l) : lines(l), actualMaxLineWidth(0) { } void add(Common::String &line, int &w) { @@ -881,7 +881,7 @@ struct WordWrapper { } }; -int Font::wordWrapText(const Common::String &str, int maxWidth, Common::StringList &lines) const { +int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Common::String> &lines) const { WordWrapper wrapper(lines); Common::String line; Common::String tmpStr; |