[Scummvm-git-logs] scummvm master -> 81a236ee8fa6c3e148b7d115517a0e9ef35b0e28

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
81a236ee8f GRAPHICS: MACGUI: Fix GCC Compiler Warnings.


Commit: 81a236ee8fa6c3e148b7d115517a0e9ef35b0e28
    https://github.com/scummvm/scummvm/commit/81a236ee8fa6c3e148b7d115517a0e9ef35b0e28
Author: D G Turner (digitall at scummvm.org)
Date: 2017-08-05T06:16:22+01:00

Commit Message:
GRAPHICS: MACGUI: Fix GCC Compiler Warnings.

Changed paths:
    graphics/macgui/macmenu.cpp
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index e42430b..dcf2e20 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -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))
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 88fe642..23442d0 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -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);