2 files changed, 29 insertions, 18 deletions

diff --git a/gui/Key.cpp b/gui/Key.cpp
index 3d6fe9f05b..92c703ef09 100644
--- a/gui/Key.cpp
+++ b/gui/Key.cpp
@@ -32,34 +32,40 @@ Key::Key() :
 _ascii(0), _keycode(0), _flags(0) {
 }
 
+Key::Key(int ascii) :
+_ascii(ascii), _keycode(ascii), _flags(0) {
+}
+
 Key::Key(int ascii, int keycode, int flags) :
 _ascii(ascii), _keycode(keycode), _flags(flags) {
 }
 
-int Key::ascii() {
-	return _ascii;
+void Key::setKey(int ascii) {
+	_ascii = ascii;
+	_keycode = ascii;
 }
 
-int Key::keycode() {
-	return _keycode;
+void Key::setKey(int ascii, int keycode) {
+	_ascii = ascii;
+	_keycode = keycode;
 }
 
-int Key::flags() {
-	return _flags;
+void Key::setKey(int ascii, int keycode, int flags) {
+	_ascii = ascii;
+	_keycode = keycode;
+	_flags = flags;
 }
 
-
-void Key::setAscii(int ascii) {
-	_ascii = ascii;
-	_keycode = ascii; // default
+int Key::ascii() {
+	return _ascii;
 }
 
-void Key::setKeycode(int keycode) {
-	_keycode = keycode;
+int Key::keycode() {
+	return _keycode;
 }
 
-void Key::setFlags(int flags) {
-	_flags = flags;
+int Key::flags() {
+	return _flags;
 }
 
 } // namespace GUI
diff --git a/gui/Key.h b/gui/Key.h
index 5b7db903ba..9283a789ae 100644
--- a/gui/Key.h
+++ b/gui/Key.h
@@ -32,13 +32,18 @@
 
 namespace GUI {
 
+// TODO/FIXME: Make use of Common::KeyState from common/keyboard.h
+
 class Key {
 public:
-	Key(int ascii, int keycode = 0, int flags = 0);
+	Key(int ascii);
+	Key(int ascii, int keycode, int flags = 0);
 	Key();
-	void setAscii(int ascii);
-	void setKeycode(int keycode);
-	void setFlags(int flags);
+
+	void setKey(int ascii);
+	void setKey(int ascii, int keycode);
+	void setKey(int ascii, int keycode, int flags);
+
 	int ascii();
 	int keycode();
 	int flags();