[Scummvm-cvs-logs] SF.net SVN: scummvm: [32944] scummvm/branches/gsoc2008-vkeybd
sk4425 at users.sourceforge.net
sk4425 at users.sourceforge.net
Mon Jul 7 17:45:48 CEST 2008
Revision: 32944
http://scummvm.svn.sourceforge.net/scummvm/?rev=32944&view=rev
Author: sk4425
Date: 2008-07-07 08:45:48 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
- updates for GCC compilation - still having linker errors though :(
Modified Paths:
--------------
scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-parser.cpp
scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp
scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.h
scummvm/branches/gsoc2008-vkeybd/backends/module.mk
scummvm/branches/gsoc2008-vkeybd/common/module.mk
scummvm/branches/gsoc2008-vkeybd/gui/module.mk
Modified: scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-parser.cpp 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-parser.cpp 2008-07-07 15:45:48 UTC (rev 32944)
@@ -103,7 +103,7 @@
Common::String name = modeNode->values["name"];
if (_keyboard->_modes.contains(name))
- return parserError("Mode '%s' has already been defined", name);
+ return parserError("Mode '%s' has already been defined", name.c_str());
// create new mode
VirtualKeyboard::Mode mode;
@@ -161,7 +161,7 @@
Common::String name = evtNode->values["name"];
if (_mode->events.contains(name))
- return parserError("Event '%s' has already been defined", name);
+ return parserError("Event '%s' has already been defined", name.c_str());
VirtualKeyboard::Event evt;
evt.name = name;
@@ -198,7 +198,7 @@
evt.type = VirtualKeyboard::kEventSwitchMode;
evt.data = new Common::String(evtNode->values["mode"]);
} else
- return parserError("Event type '%s' not known", type);
+ return parserError("Event type '%s' not known", type.c_str());
_mode->events[name] = evt;
@@ -284,7 +284,7 @@
return parserError("Invalid coords for polygon area");
_mode->imageMap.addPolygonMapArea(poly, areaNode->values["target"]);
} else
- return parserError("Area shape '%s' not known", shape);
+ return parserError("Area shape '%s' not known", shape.c_str());
return true;
}
Modified: scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp 2008-07-07 15:45:48 UTC (rev 32944)
@@ -112,7 +112,7 @@
// if no image then it means layout tag for the
// required resolution was missing from the mode tag.
if (!it->_value.image) {
- warning("'%s' layout missing from '%s' mode", it->_value.resolution, it->_value.name);
+ warning("'%s' layout missing from '%s' mode", it->_value.resolution.c_str(), it->_value.name.c_str());
return false;
}
}
@@ -134,6 +134,8 @@
case kAlignRight:
_pos.x = scrW - keyW;
break;
+ default:
+ break;
}
}
if (scrH != keyH) {
@@ -144,6 +146,8 @@
case kAlignBottom:
_pos.y = scrH - keyH;
break;
+ default:
+ break;
}
}
}
@@ -224,6 +228,8 @@
case Common::EVENT_QUIT:
_system->quit();
return;
+ default:
+ break;
}
}
}
Modified: scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.h 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.h 2008-07-07 15:45:48 UTC (rev 32944)
@@ -48,9 +48,7 @@
enum EventType {
kEventKey,
kEventSwitchMode,
- kEventClose,
-
- kEventMax
+ kEventClose
};
struct Event {
Modified: scummvm/branches/gsoc2008-vkeybd/backends/module.mk
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/module.mk 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/backends/module.mk 2008-07-07 15:45:48 UTC (rev 32944)
@@ -27,7 +27,9 @@
saves/savefile.o \
saves/default/default-saves.o \
saves/compressed/compressed-saves.o \
- timer/default/default-timer.o
+ timer/default/default-timer.o \
+ common/virtual-keyboard.o \
+ common/virtual-keyboard-parser.o
# Include common rules
include $(srcdir)/rules.mk
Modified: scummvm/branches/gsoc2008-vkeybd/common/module.mk
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/common/module.mk 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/common/module.mk 2008-07-07 15:45:48 UTC (rev 32944)
@@ -6,7 +6,7 @@
config-manager.o \
file.o \
fs.o \
- imageMap.o \
+ image-map.o \
hashmap.o \
memorypool.o \
md5.o \
Modified: scummvm/branches/gsoc2008-vkeybd/gui/module.mk
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/module.mk 2008-07-07 15:42:26 UTC (rev 32943)
+++ scummvm/branches/gsoc2008-vkeybd/gui/module.mk 2008-07-07 15:45:48 UTC (rev 32944)
@@ -25,9 +25,7 @@
theme.o \
ThemeClassic.o \
ThemeModern.o \
- theme-config.o \
- virtualKeyboard.o \
- virtualKeyboardParser.o
+ theme-config.o
# Include common rules
include $(srcdir)/rules.mk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list