synced with scummvm to 2011-Apr-13

backends/vkeybd/image-map.cpp

@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/sys.h"
+
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/image-map.h"

backends/vkeybd/packs/vkeybdpack.py

@@ -16,9 +16,9 @@ def buildPack(packName):
 	if not os.path.isdir(packName):
 		print ("Invalid pack name: " + packName)
 		return
-	
+
 	zf = zipfile.ZipFile(packName + ".zip", 'w')
-	
+
 	zf.compress_type = zipfile.ZIP_DEFLATED
 
 	print ("Building '" + packName + "' pack:")
@@ -28,9 +28,9 @@ def buildPack(packName):
 		if os.path.isfile(filename) and not filename[0] == '.' and filename.endswith(PACK_FILE_EXTENSIONS):
 			zf.write(filename, './' + filename, compress_type=compression)
 			print ("    Adding file: " + filename)
-			
+
 	os.chdir('../')
-	
+
 	zf.close()
 
 def buildAllPacks():
@@ -49,13 +49,13 @@ def printUsage():
 	print ("    Builds the pack called 'packname'.\n")
 
 def main():
-		
+
 	if len(sys.argv) == 2 and sys.argv[1] == "makeall":
 		buildAllPacks()
-		
+
 	elif len(sys.argv) == 3 and sys.argv[1] == "make":
 		buildPack(sys.argv[2])
-		
+
 	else:
 		printUsage()
 

backends/vkeybd/polygon.cpp

@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/sys.h"
+
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/polygon.h"

backends/vkeybd/virtual-keyboard-gui.cpp

@@ -23,13 +23,15 @@
 *
 */
 
+#include "common/sys.h"
+
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 
 #include "graphics/cursorman.h"
 #include "graphics/fontman.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
 
 namespace Common {
 

backends/vkeybd/virtual-keyboard-parser.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/sys.h"
 
 #ifdef ENABLE_VKEYBD
 
@@ -34,6 +35,7 @@
 #include "common/system.h"
 #include "common/archive.h"
 #include "common/tokenizer.h"
+#include "common/stream.h"
 
 #include "graphics/imagedec.h"
 
@@ -270,7 +272,7 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) {
 
 	int r, g, b;
 	if (node->values.contains("transparent_color")) {
-		if (!parseIntegerKey(node->values["transparent_color"].c_str(), 3, &r, &g, &b))
+		if (!parseIntegerKey(node->values["transparent_color"], 3, &r, &g, &b))
 			return parserError("Could not parse color value");
 	} else {
 		// default to purple
@@ -281,7 +283,7 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) {
 	_mode->transparentColor = format.RGBToColor(r, g, b);
 
 	if (node->values.contains("display_font_color")) {
-		if (!parseIntegerKey(node->values["display_font_color"].c_str(), 3, &r, &g, &b))
+		if (!parseIntegerKey(node->values["display_font_color"], 3, &r, &g, &b))
 			return parserError("Could not parse color value");
 	} else {
 		r = g = b = 0; // default to black
@@ -336,7 +338,7 @@ byte VirtualKeyboardParser::parseFlags(const String& flags) {
 
 bool VirtualKeyboardParser::parseRect(Rect &rect, const String& coords) {
 	int x1, y1, x2, y2;
-	if (!parseIntegerKey(coords.c_str(), 4, &x1, &y1, &x2, &y2))
+	if (!parseIntegerKey(coords, 4, &x1, &y1, &x2, &y2))
 		return parserError("Invalid coords for rect area");
 	rect.left = x1;
 	rect.top = y1;

backends/vkeybd/virtual-keyboard.cpp

@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/sys.h"
+
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard.h"