aboutsummaryrefslogtreecommitdiff
path: root/backends/vkeybd
diff options
context:
space:
mode:
authorMax Horn2011-04-14 14:34:28 +0200
committerMax Horn2011-04-14 14:34:28 +0200
commit2e095e25f2435f0d066d2826176e394bda5c4a9c (patch)
tree81d2c4d9e26e4a7644087a13c61b785ae3e431c8 /backends/vkeybd
parent84184aabc00251374a181fe296487619afa779ed (diff)
downloadscummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.gz
scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.bz2
scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.zip
ALL: centre -> center
Diffstat (limited to 'backends/vkeybd')
-rw-r--r--backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml2
-rw-r--r--backends/vkeybd/virtual-keyboard-gui.cpp2
-rw-r--r--backends/vkeybd/virtual-keyboard-parser.cpp2
-rw-r--r--backends/vkeybd/virtual-keyboard-parser.h2
-rw-r--r--backends/vkeybd/virtual-keyboard.cpp2
-rw-r--r--backends/vkeybd/virtual-keyboard.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
index 86f39d3d4d..85a27c71ca 100644
--- a/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
+++ b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<keyboard initial_mode="lowercase" v_align="bottom" h_align="centre">
+<keyboard initial_mode="lowercase" v_align="bottom" h_align="center">
<!-- coords key = "start x, start y, end x, end y" -->
<!-- Lowercase -->
<mode name="lowercase" resolutions="320x240,640x480">
diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index c5ab39e46b..050ab5c5a2 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -203,7 +203,7 @@ void VirtualKeyboardGUI::moveToDefaultPosition()
case VirtualKeyboard::kAlignLeft:
x = 0;
break;
- case VirtualKeyboard::kAlignCentre:
+ case VirtualKeyboard::kAlignCenter:
x = (_screenW - kbdW) / 2;
break;
case VirtualKeyboard::kAlignRight:
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp
index a81258b25f..3ebdfdc653 100644
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@@ -84,7 +84,7 @@ bool VirtualKeyboardParser::parserCallback_keyboard(ParserNode *node) {
if (h.equalsIgnoreCase("left"))
_keyboard->_hAlignment = VirtualKeyboard::kAlignLeft;
else if (h.equalsIgnoreCase("centre") || h.equalsIgnoreCase("center"))
- _keyboard->_hAlignment = VirtualKeyboard::kAlignCentre;
+ _keyboard->_hAlignment = VirtualKeyboard::kAlignCenter;
else if (h.equalsIgnoreCase("right"))
_keyboard->_hAlignment = VirtualKeyboard::kAlignRight;
}
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index 9723744dc4..1327008a80 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -51,7 +51,7 @@ keyboard layouts for different screen resolutions.
** Example keyboard pack description file **
********************************************
-<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="centre">
+<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="center">
<mode name="normal" resolutions="640x400,320x200">
<layout resolution="640x400" bitmap="normal_640x400.bmp" transparent_color="255,0,255">
<map>
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 31fde8c0fa..5add387717 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -71,7 +71,7 @@ void VirtualKeyboard::reset() {
deleteEvents();
_modes.clear();
_initialMode = _currentMode = 0;
- _hAlignment = kAlignCentre;
+ _hAlignment = kAlignCenter;
_vAlignment = kAlignBottom;
_keyQueue.clear();
_loaded = false;
diff --git a/backends/vkeybd/virtual-keyboard.h b/backends/vkeybd/virtual-keyboard.h
index db94cbe476..169cd67833 100644
--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@@ -134,7 +134,7 @@ protected:
enum HorizontalAlignment {
kAlignLeft,
- kAlignCentre,
+ kAlignCenter,
kAlignRight
};