diff options
| -rw-r--r-- | backends/common/virtual-keyboard-parser.cpp | 8 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard.cpp | 8 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard.h | 4 | ||||
| -rw-r--r-- | backends/module.mk | 4 | ||||
| -rw-r--r-- | common/module.mk | 2 | ||||
| -rw-r--r-- | gui/module.mk | 4 |
6 files changed, 17 insertions, 13 deletions
diff --git a/backends/common/virtual-keyboard-parser.cpp b/backends/common/virtual-keyboard-parser.cpp index d45ee7fdee..9c2adb4dc2 100644 --- a/backends/common/virtual-keyboard-parser.cpp +++ b/backends/common/virtual-keyboard-parser.cpp @@ -103,7 +103,7 @@ bool VirtualKeyboardParser::parserCallback_Mode() { 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 @@ bool VirtualKeyboardParser::parserCallback_Event() { 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 @@ bool VirtualKeyboardParser::parserCallback_Event() { 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 @@ bool VirtualKeyboardParser::parserCallback_Area() { 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; } diff --git a/backends/common/virtual-keyboard.cpp b/backends/common/virtual-keyboard.cpp index 0ac6e4efad..f45769940a 100644 --- a/backends/common/virtual-keyboard.cpp +++ b/backends/common/virtual-keyboard.cpp @@ -112,7 +112,7 @@ bool VirtualKeyboard::loadKeyboardPack(Common::String packName) { // 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 @@ void VirtualKeyboard::reposition() case kAlignRight: _pos.x = scrW - keyW; break; + default: + break; } } if (scrH != keyH) { @@ -144,6 +146,8 @@ void VirtualKeyboard::reposition() case kAlignBottom: _pos.y = scrH - keyH; break; + default: + break; } } } @@ -224,6 +228,8 @@ void VirtualKeyboard::runLoop() { case Common::EVENT_QUIT: _system->quit(); return; + default: + break; } } } diff --git a/backends/common/virtual-keyboard.h b/backends/common/virtual-keyboard.h index a0a678ba86..ff07384e06 100644 --- a/backends/common/virtual-keyboard.h +++ b/backends/common/virtual-keyboard.h @@ -48,9 +48,7 @@ class VirtualKeyboard { enum EventType { kEventKey, kEventSwitchMode, - kEventClose, - - kEventMax + kEventClose }; struct Event { diff --git a/backends/module.mk b/backends/module.mk index 6642a3a281..fba5bbe907 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -27,7 +27,9 @@ MODULE_OBJS := \ 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 diff --git a/common/module.mk b/common/module.mk index d3b483c8e5..e947b7ddd9 100644 --- a/common/module.mk +++ b/common/module.mk @@ -6,7 +6,7 @@ MODULE_OBJS := \ config-manager.o \ file.o \ fs.o \ - imageMap.o \ + image-map.o \ hashmap.o \ memorypool.o \ md5.o \ diff --git a/gui/module.mk b/gui/module.mk index ef3d5bca49..c572dcbeea 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -25,9 +25,7 @@ MODULE_OBJS := \ theme.o \ ThemeClassic.o \ ThemeModern.o \ - theme-config.o \ - virtualKeyboard.o \ - virtualKeyboardParser.o + theme-config.o # Include common rules include $(srcdir)/rules.mk |