aboutsummaryrefslogtreecommitdiff
path: root/gui/newgui.cpp
diff options
context:
space:
mode:
authorMax Horn2004-02-05 00:19:57 +0000
committerMax Horn2004-02-05 00:19:57 +0000
commitf59eb3b2194826c73f56161497f4004b2313efa2 (patch)
tree5c070e2626f83d256fc161a8ec7e98ca2397af58 /gui/newgui.cpp
parentdc852177fb27b83620f0a4296cde0e1a8dec1f62 (diff)
downloadscummvm-rg350-f59eb3b2194826c73f56161497f4004b2313efa2.tar.gz
scummvm-rg350-f59eb3b2194826c73f56161497f4004b2313efa2.tar.bz2
scummvm-rg350-f59eb3b2194826c73f56161497f4004b2313efa2.zip
renamed (Const)Iterator to (const_)iterator; changed size() to return an uint
svn-id: r12722
Diffstat (limited to 'gui/newgui.cpp')
-rw-r--r--gui/newgui.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index ed60deb024..1745ee3838 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -459,7 +459,7 @@ void NewGui::drawChar(byte chr, int xx, int yy, NewGuiColor color) {
int NewGui::getStringWidth(const String &str) {
int space = 0;
- for (int i = 0; i < str.size(); ++i)
+ for (uint i = 0; i < str.size(); ++i)
space += getCharWidth(str[i]);
return space;
}
@@ -483,7 +483,7 @@ int NewGui::getCharWidth(byte c) {
void NewGui::drawString(const String &s, int x, int y, int w, NewGuiColor color, int align, int deltax, bool useEllipsis) {
const int leftX = x, rightX = x + w;
- int i;
+ uint i;
int width = getStringWidth(s);
String str;