thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: MACGUI: Fix GCC Compiler Warnings.

Browse source
This commit is contained in:
D G Turner 2017-08-05 06:16:22 +01:00
parent a851c3b185
commit 81a236ee8f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
graphics/macgui/macmenu.cpp
View file

@ -592,7 +592,7 @@ void MacMenu::enableCommand(int menunum, int action, bool state) {
}
void MacMenu::enableCommand(const char *menuitem, const char *menuaction, bool state) {
int menunum = 0;
uint menunum = 0;
while (menunum < _items.size())
if (_items[menunum]->name.equalsIgnoreCase(menuitem))

8
graphics/macgui/mactext.cpp
View file

@ -508,11 +508,11 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int
if (formatted)
res += _textLines[i].chunks[chunk].toString();
if (endCol >= _textLines[i].chunks[chunk].text.size())
if (endCol >= (int) _textLines[i].chunks[chunk].text.size())
res += _textLines[i].chunks[chunk].text;
else
res += Common::String(_textLines[i].chunks[chunk].text.c_str(), endCol);
} else if (_textLines[i].chunks[chunk].text.size() > startCol) {
} else if ((int) _textLines[i].chunks[chunk].text.size() > startCol) {
if (formatted)
res += _textLines[i].chunks[chunk].toString();
@ -532,7 +532,7 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int
res += _textLines[i].chunks[chunk].toString();
res += _textLines[i].chunks[chunk].text;
} else if (_textLines[i].chunks[chunk].text.size() > startCol) {
} else if ((int) _textLines[i].chunks[chunk].text.size() > startCol) {
if (formatted)
res += _textLines[i].chunks[chunk].toString();
@ -546,7 +546,7 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int
if (formatted)
res += _textLines[i].chunks[chunk].toString();
if (endCol >= _textLines[i].chunks[chunk].text.size())
if (endCol >= (int) _textLines[i].chunks[chunk].text.size())
res += _textLines[i].chunks[chunk].text;
else
res += Common::String(_textLines[i].chunks[chunk].text.c_str(), endCol);